Merge pull request eclipse-openj9#21 from cathyzhyi/withfield-valhall…

…a-sandbox fix withfield with null
cathyzhyi · Mar 31, 2020 · 7d395e2 · 7d395e2
2 parents a010c1e + a54d579
commit 7d395e2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/runtime/compiler/ilgen/Walker.cpp b/runtime/compiler/ilgen/Walker.cpp
@@ -6095,6 +6095,9 @@ TR_J9ByteCodeIlGenerator::genWithField(uint16_t fieldCpIndex)
    TR::Node *newFieldValue = pop();
    TR::Node *originalObject = pop();
 
+   TR::Node *passThruNode = TR::Node::create(TR::PassThrough, 1, originalObject);
+   genTreeTop(genNullCheck(passThruNode));
+
    loadClassObject(valueClass);
    const TR::TypeLayout *typeLayout = comp()->typeLayout(valueClass);
    size_t fieldCount = typeLayout->count();