Merge pull request #20304 from IBMJimmyk/nullptrFix

Changes some uses of nullptr to NULL
eclipse-openj9 · Oct 4, 2024 · 845b1ce · 845b1ce
2 parents bfc3936 + fe56b6f
commit 845b1ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/runtime/compiler/env/j9method.cpp b/runtime/compiler/env/j9method.cpp
@@ -5546,7 +5546,7 @@ TR_J9MethodBase::isUnsafeCAS(TR::Compilation * c)
  * The TR::Compilation parameter "c" is sometimes null. But, it is needed to perform a platform target check.
  * So, if it is null, this code goes and gets comp.
  */
- if (nullptr == c)
+ if (NULL == c)
  {
  c = TR::comp();
  }

diff --git a/runtime/compiler/x/codegen/J9TreeEvaluator.cpp b/runtime/compiler/x/codegen/J9TreeEvaluator.cpp
@@ -9533,7 +9533,7 @@ static TR::Register* inlineCompareAndSwapObjectNative(TR::Node* node, TR::CodeGe
  TR::Register* offset = cg->evaluate(offsetNode);
  TR::Register* oldValue = cg->evaluate(oldValueNode);
  TR::Register* newValue = cg->evaluate(newValueNode);
- TR::Register* result = isExchange ? nullptr : cg->allocateRegister();
+ TR::Register* result = isExchange ? NULL : cg->allocateRegister();
  TR::Register* EAX = cg->allocateRegister();
  TR::Register* tmp = cg->allocateRegister();