Changeset 254602 in webkit

Timestamp:

Jan 15, 2020, 11:15:22 AM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r254244. rdar://problem/58553148

Instruction.h: Multiplication result converted to larger type
​https://bugs.webkit.org/show_bug.cgi?id=205945

Reviewed by Mark Lam.

• bytecode/Instruction.h: (JSC::BaseInstruction::size const): Changed the types to size_t so that the computation is computed accordingly.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@254244 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-609-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/Instruction.h (modified) (1 diff)

branches/safari-609-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-01-14  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r254244. rdar://problem/58553148
+
+    Instruction.h: Multiplication result converted to larger type
+    https://bugs.webkit.org/show_bug.cgi?id=205945
+    
+    Reviewed by Mark Lam.
+    
+    * bytecode/Instruction.h:
+    (JSC::BaseInstruction::size const):
+    Changed the types to size_t so that the computation is computed accordingly.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-08  Michael Saboff  <msaboff@apple.com>
+
+            Instruction.h: Multiplication result converted to larger type
+            https://bugs.webkit.org/show_bug.cgi?id=205945
+
+            Reviewed by Mark Lam.
+
+            * bytecode/Instruction.h:
+            (JSC::BaseInstruction::size const):
+            Changed the types to size_t so that the computation is computed accordingly.
+
+
 2020-01-14  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/Source/JavaScriptCore/bytecode/Instruction.h

@@ -119 +119 @@
     {
         auto sizeShiftAmount = this->sizeShiftAmount<Traits>();
-        auto prefixSize = sizeShiftAmount ? 1 : 0;
-        auto operandSize = 1 << sizeShiftAmount;
+        size_t prefixSize = sizeShiftAmount ? 1 : 0;
+        size_t operandSize = static_cast<size_t>(1) << sizeShiftAmount;
         size_t sizeOfBytecode = 1;
         return sizeOfBytecode + (Traits::opcodeLengths[opcodeID<Traits>()] - 1) * operandSize + prefixSize;