Merge pull request #3219 from liqunl/vhmethodname

Fix incorrect recognized method name in VarHandleTransformer
eclipse-openj9 · Oct 11, 2018 · 00ca2b4 · 00ca2b4
2 parents 642c244 + 40efee5
commit 00ca2b4
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/runtime/compiler/optimizer/VarHandleTransformer.cpp b/runtime/compiler/optimizer/VarHandleTransformer.cpp
@@ -128,11 +128,11 @@ static X VarHandleMethods[] =
       {  TR::java_lang_invoke_VarHandle_getAndBitwiseAndAcquire   ,   23, "getAndBitwiseAndAcquire",         (int16_t)-1, "*", 23},
       {  TR::java_lang_invoke_VarHandle_getAndBitwiseAndRelease   ,   23, "getAndBitwiseAndRelease",         (int16_t)-1, "*", 24},
       {  TR::java_lang_invoke_VarHandle_getAndBitwiseOr           ,   15, "getAndBitwiseOr",                 (int16_t)-1, "*", 25},
-      {  TR::java_lang_invoke_VarHandle_getAndBitwiseOrAcquire    ,   23, "getAndBitwiseAndAcquire",         (int16_t)-1, "*", 26},
-      {  TR::java_lang_invoke_VarHandle_getAndBitwiseOrRelease    ,   23, "getAndBitwiseAndRelease",         (int16_t)-1, "*", 27},
-      {  TR::java_lang_invoke_VarHandle_getAndBitwiseXor          ,   15, "getAndBitwiseOr",                 (int16_t)-1, "*", 28},
-      {  TR::java_lang_invoke_VarHandle_getAndBitwiseXorAcquire   ,   23, "getAndBitwiseAndAcquire",         (int16_t)-1, "*", 29},
-      {  TR::java_lang_invoke_VarHandle_getAndBitwiseXorRelease   ,   23, "getAndBitwiseAndRelease",         (int16_t)-1, "*", 30},
+      {  TR::java_lang_invoke_VarHandle_getAndBitwiseOrAcquire    ,   22, "getAndBitwiseOrAcquire",          (int16_t)-1, "*", 26},
+      {  TR::java_lang_invoke_VarHandle_getAndBitwiseOrRelease    ,   22, "getAndBitwiseOrRelease",          (int16_t)-1, "*", 27},
+      {  TR::java_lang_invoke_VarHandle_getAndBitwiseXor          ,   16, "getAndBitwiseXOr",                (int16_t)-1, "*", 28},
+      {  TR::java_lang_invoke_VarHandle_getAndBitwiseXorAcquire   ,   23, "getAndBitwiseXorAcquire",         (int16_t)-1, "*", 29},
+      {  TR::java_lang_invoke_VarHandle_getAndBitwiseXorRelease   ,   23, "getAndBitwiseXorRelease",         (int16_t)-1, "*", 30},
       {  TR::unknownMethod, 0, 0, 0, 0, -1}
       };