Changeset 249370 in webkit

Timestamp:

Sep 1, 2019 4:35:51 PM (5 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Fix testb3 debug failures
​https://bugs.webkit.org/show_bug.cgi?id=201382

Reviewed by Mark Lam.

Fix testb3 debug failures due to incorrect types of operations like pointer + int32.

• b3/testb3_8.cpp:

(testByteCopyLoop):
(testByteCopyLoopStartIsLoopDependent):
(testByteCopyLoopBoundIsLoopDependent):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• b3/testb3_8.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-09-01  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Fix testb3 debug failures
+        https://bugs.webkit.org/show_bug.cgi?id=201382
+
+        Reviewed by Mark Lam.
+
+        Fix testb3 debug failures due to incorrect types of operations like pointer + int32.
+
+        * b3/testb3_8.cpp:
+        (testByteCopyLoop):
+        (testByteCopyLoopStartIsLoopDependent):
+        (testByteCopyLoopBoundIsLoopDependent):
+
 2019-09-01  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/b3/testb3_8.cpp

@@ -938 +938 @@
     auto* arraySrc = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
     auto* arrayDst = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
-    auto* arraySize = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR2);
+    auto* arraySize = root->appendNew<Value>(proc, Trunc, Origin(), root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR2));
     auto* one = root->appendNew<Const32Value>(proc, Origin(), 1);
     auto* two = root->appendNew<Const32Value>(proc, Origin(), 2);
@@ -947 +947 @@
     auto* index = head->appendNew<Value>(proc, Phi, Int32, Origin());
     startingIndex->setPhi(index);
-    auto* loadIndex = head->appendNew<Value>(proc, Add, Origin(), arraySrc, head->appendNew<Value>(proc, Shl, Origin(), index, two));
-    auto* storeIndex = head->appendNew<Value>(proc, Add, Origin(), arrayDst, head->appendNew<Value>(proc, Shl, Origin(), index, two));
+    auto* loadIndex = head->appendNew<Value>(proc, Add, Origin(), arraySrc,
+        head->appendNew<Value>(proc, ZExt32, Origin(), head->appendNew<Value>(proc, Shl, Origin(), index, two)));
+    auto* storeIndex = head->appendNew<Value>(proc, Add, Origin(), arrayDst,
+        head->appendNew<Value>(proc, ZExt32, Origin(), head->appendNew<Value>(proc, Shl, Origin(), index, two)));
     head->appendNew<MemoryValue>(proc, Store, Origin(), head->appendNew<MemoryValue>(proc, Load, Int32, Origin(), loadIndex), storeIndex);
     auto* newIndex = head->appendNew<Value>(proc, Add, Origin(), index, one);
@@ -992 +994 @@
     auto* arraySrc = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
     auto* arrayDst = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR1);
-    auto* arraySize = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR2);
+    auto* arraySize = root->appendNew<Value>(proc, Trunc, Origin(), root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR2));
     auto* one = root->appendNew<Const32Value>(proc, Origin(), 1);
     auto* two = root->appendNew<Const32Value>(proc, Origin(), 2);
@@ -1001 +1003 @@
     auto* index = head->appendNew<Value>(proc, Phi, Int32, Origin());
     startingIndex->setPhi(index);
-    auto* loadIndex = head->appendNew<Value>(proc, Add, Origin(), arraySrc, head->appendNew<Value>(proc, Shl, Origin(), index, two));
-    auto* storeIndex = head->appendNew<Value>(proc, Add, Origin(), arrayDst, head->appendNew<Value>(proc, Shl, Origin(), index, two));
+    auto* loadIndex = head->appendNew<Value>(proc, Add, Origin(), arraySrc,
+        head->appendNew<Value>(proc, ZExt32, Origin(), head->appendNew<Value>(proc, Shl, Origin(), index, two)));
+    auto* storeIndex = head->appendNew<Value>(proc, Add, Origin(), arrayDst,
+        head->appendNew<Value>(proc, ZExt32, Origin(), head->appendNew<Value>(proc, Shl, Origin(), index, two)));
     head->appendNew<MemoryValue>(proc, Store, Origin(), head->appendNew<MemoryValue>(proc, Load, Int32, Origin(), loadIndex), storeIndex);
     auto* newIndex = head->appendNew<Value>(proc, Add, Origin(), index, one);
@@ -1054 +1058 @@
     auto* index = head->appendNew<Value>(proc, Phi, Int32, Origin());
     startingIndex->setPhi(index);
-    auto* loadIndex = head->appendNew<Value>(proc, Add, Origin(), arraySrc, head->appendNew<Value>(proc, Shl, Origin(), index, two));
-    auto* storeIndex = head->appendNew<Value>(proc, Add, Origin(), arrayDst, head->appendNew<Value>(proc, Shl, Origin(), index, two));
+    auto* loadIndex = head->appendNew<Value>(proc, Add, Origin(), arraySrc,
+        head->appendNew<Value>(proc, ZExt32, Origin(), head->appendNew<Value>(proc, Shl, Origin(), index, two)));
+    auto* storeIndex = head->appendNew<Value>(proc, Add, Origin(), arrayDst,
+        head->appendNew<Value>(proc, ZExt32, Origin(), head->appendNew<Value>(proc, Shl, Origin(), index, two)));
     head->appendNew<MemoryValue>(proc, Store, Origin(), head->appendNew<MemoryValue>(proc, Load, Int32, Origin(), loadIndex), storeIndex);
     auto* newIndex = head->appendNew<Value>(proc, Add, Origin(), index, one);