Handle NULL String Class Pointer

dsouzai · dsouzai · commit 55d23e5dea70 · 2019-10-15T13:24:04.000-04:00
TR::Compilation::getStringClassPointer() can return NULL in an AOT
compilation. Fix String Peepholes to check for NULL.

Signed-off-by: Irwin D'Souza &lt;dsouzai.gh@gmail.com&gt;
diff --git a/runtime/compiler/optimizer/StringPeepholes.cpp b/runtime/compiler/optimizer/StringPeepholes.cpp
@@ -2068,7 +2068,12 @@ TR::SymbolReference *TR_StringPeepholes::findSymRefForValueOf(const char *sig)
    {
    // try to find the symbol ref for String.valueOf
    TR_OpaqueClassBlock *stringClass = comp()->getStringClassPointer();
-   TR_ASSERT(stringClass, "stringClass cannot be 0 because we did this before in init\n");
+
+   // It is possible for getStringClassPointer to return NULL in an AOT compilation
+   if (!stringClass && comp()->compileRelocatableCode())
+      comp()->failCompilation<TR::CompilationException>("StringPeepholes: stringClass is NULL");
+
+   TR_ASSERT_FATAL(stringClass, "stringClass should not be NULL\n");
    TR_ResolvedMethod *method = comp()->fej9()->getResolvedMethodForNameAndSignature(trMemory(), stringClass, "valueOf", sig);
    return method ? getSymRefTab()->findOrCreateMethodSymbol(JITTED_METHOD_INDEX, -1, method, TR::MethodSymbol::Static) : NULL;
    }

Original file line number	Diff line number	Diff line change
`@@ -2068,7 +2068,12 @@ TR::SymbolReference TR_StringPeepholes::findSymRefForValueOf(const char sig)`
`2068`	`2068`	`{`
`2069`	`2069`	`// try to find the symbol ref for String.valueOf`
`2070`	`2070`	`TR_OpaqueClassBlock *stringClass = comp()->getStringClassPointer();`
`2071`		`- TR_ASSERT(stringClass, "stringClass cannot be 0 because we did this before in init\n");`
	`2071`	`+`
	`2072`	`+ // It is possible for getStringClassPointer to return NULL in an AOT compilation`
	`2073`	`+ if (!stringClass && comp()->compileRelocatableCode())`
	`2074`	`+ comp()->failCompilation<TR::CompilationException>("StringPeepholes: stringClass is NULL");`
	`2075`	`+`
	`2076`	`+ TR_ASSERT_FATAL(stringClass, "stringClass should not be NULL\n");`
`2072`	`2077`	`TR_ResolvedMethod *method = comp()->fej9()->getResolvedMethodForNameAndSignature(trMemory(), stringClass, "valueOf", sig);`
`2073`	`2078`	`return method ? getSymRefTab()->findOrCreateMethodSymbol(JITTED_METHOD_INDEX, -1, method, TR::MethodSymbol::Static) : NULL;`
`2074`	`2079`	`}`