GR-36195: createAnnotationType check for null type

cosminbasca · cosminbasca · commit 659a09c8b3d2 · 2022-01-19T17:46:36.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonSSTNodeFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonSSTNodeFactory.java
@@ -183,7 +183,7 @@ public SSTNode createImportFrom(String from, String[][] asNames, int startOffset
 
     public SSTNode createAnnotationType(SSTNode type) {
         SSTNode annotType = type;
-        if (futureAnnotations) {
+        if (futureAnnotations && type != null) {
             final String value = source.getCharacters().subSequence(type.getStartOffset() - 1, type.getEndOffset() + 1).toString();
             annotType = createStringLiteral(new String[]{value}, type.getStartOffset(), type.getEndOffset());
         }

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public SSTNode createImportFrom(String from, String[][] asNames, int startOffset`
`183`	`183`
`184`	`184`	`public SSTNode createAnnotationType(SSTNode type) {`
`185`	`185`	`SSTNode annotType = type;`
`186`		`- if (futureAnnotations) {`
	`186`	`+ if (futureAnnotations && type != null) {`
`187`	`187`	`final String value = source.getCharacters().subSequence(type.getStartOffset() - 1, type.getEndOffset() + 1).toString();`
`188`	`188`	`annotType = createStringLiteral(new String[]{value}, type.getStartOffset(), type.getEndOffset());`
`189`	`189`	`}`