Merge pull request #19056 from Akira1Saitoh/fixTransformIndexOfKnownString044

pshipton · web-flow · commit d786bbb119ca · 2024-03-04T09:36:25.000-05:00
(0.44) Fix transformIndexOfKnownString to handle 8bit characters properly
diff --git a/runtime/compiler/optimizer/J9ValuePropagation.cpp b/runtime/compiler/optimizer/J9ValuePropagation.cpp
@@ -389,8 +389,7 @@ bool J9::ValuePropagation::transformIndexOfKnownString(
             else
                {
                uintptr_t element = TR::Compiler->om.getAddressOfElement(comp(), string, i + TR::Compiler->om.contiguousArrayHeaderSizeInBytes());
-               uint8_t chByte  = *((uint8_t*)element);
-               ch = chByte;
+               ch  = *((uint8_t*)element);
                }
             }
          else
@@ -426,8 +425,7 @@ bool J9::ValuePropagation::transformIndexOfKnownString(
          else
             {
             uintptr_t element = TR::Compiler->om.getAddressOfElement(comp(), string, start + TR::Compiler->om.contiguousArrayHeaderSizeInBytes());
-            int8_t chByte  = *((uint8_t*)element);
-            ch = chByte;
+            ch  = *((uint8_t*)element);
             }
          }
       else
@@ -464,8 +462,7 @@ bool J9::ValuePropagation::transformIndexOfKnownString(
             else
                {
                uintptr_t element = TR::Compiler->om.getAddressOfElement(comp(), string, i + TR::Compiler->om.contiguousArrayHeaderSizeInBytes());
-               int8_t chByte  = *((uint8_t*)element);
-               ch = chByte;
+               ch  = *((uint8_t*)element);
                }
             }
          else

Original file line number	Diff line number	Diff line change
`@@ -389,8 +389,7 @@ bool J9::ValuePropagation::transformIndexOfKnownString(`
`389`	`389`	`else`
`390`	`390`	`{`
`391`	`391`	`uintptr_t element = TR::Compiler->om.getAddressOfElement(comp(), string, i + TR::Compiler->om.contiguousArrayHeaderSizeInBytes());`
`392`		`- uint8_t chByte = ((uint8_t)element);`
`393`		`- ch = chByte;`
	`392`	`+ ch = ((uint8_t)element);`
`394`	`393`	`}`
`395`	`394`	`}`
`396`	`395`	`else`
`@@ -426,8 +425,7 @@ bool J9::ValuePropagation::transformIndexOfKnownString(`
`426`	`425`	`else`
`427`	`426`	`{`
`428`	`427`	`uintptr_t element = TR::Compiler->om.getAddressOfElement(comp(), string, start + TR::Compiler->om.contiguousArrayHeaderSizeInBytes());`
`429`		`- int8_t chByte = ((uint8_t)element);`
`430`		`- ch = chByte;`
	`428`	`+ ch = ((uint8_t)element);`
`431`	`429`	`}`
`432`	`430`	`}`
`433`	`431`	`else`
`@@ -464,8 +462,7 @@ bool J9::ValuePropagation::transformIndexOfKnownString(`
`464`	`462`	`else`
`465`	`463`	`{`
`466`	`464`	`uintptr_t element = TR::Compiler->om.getAddressOfElement(comp(), string, i + TR::Compiler->om.contiguousArrayHeaderSizeInBytes());`
`467`		`- int8_t chByte = ((uint8_t)element);`
`468`		`- ch = chByte;`
	`465`	`+ ch = ((uint8_t)element);`
`469`	`466`	`}`
`470`	`467`	`}`
`471`	`468`	`else`