Revert FitsInDWord implementation

Cellule · Cellule · commit d8a4541a7144 · 2017-01-12T14:40:54.000-08:00
Use the IntConstType to check for IsLargeConstant in Security instead of casting it to an int32
diff --git a/lib/Backend/Security.cpp b/lib/Backend/Security.cpp
@@ -240,7 +240,7 @@ Security::EncodeOpnd(IR::Instr *instr, IR::Opnd *opnd)
     {
         IR::IntConstOpnd *intConstOpnd = opnd->AsIntConstOpnd();
 
-        if (!this->IsLargeConstant(intConstOpnd->AsInt32()))
+        if (!this->IsLargeConstant(intConstOpnd->GetValue()))
         {
             return;
         }
diff --git a/lib/Backend/Security.h b/lib/Backend/Security.h
@@ -26,7 +26,7 @@ class Security
 
     // Large constants have more than 16 significant bits.
     // Constants except these are considered large: 0x0000????, 0xffff????, 0x????0000, 0x????ffff
-    static bool     IsLargeConstant(int32 value) { return static_cast<int16>(value) != 0 && static_cast<int16>(value) != -1 && (value >> 16) != 0 && (value >> 16) != -1; }
+    static bool     IsLargeConstant(IntConstType value) { return static_cast<int16>(value) != 0 && static_cast<int16>(value) != -1 && (value >> 16) != 0 && (value >> 16) != -1; }
 
     void            InsertNOPBefore(IR::Instr *instr);
     int             GetNextNOPInsertPoint();
diff --git a/lib/Common/Common/MathUtil.h b/lib/Common/Common/MathUtil.h
@@ -44,17 +44,8 @@ class Math
     }
 
     static bool     FitsInDWord(int32 value) { return true; }
-    static bool     FitsInDWord(int64 value) { return ((int64)(signed int)(value & 0xFFFFFFFF) == value); }
-    static bool     FitsInDWord(size_t value)
-    {
-#if TARGET_32
-        CompileAssert(sizeof(size_t) == 4);
-        return FitsInDWord((int32) value);
-#elif TARGET_64
-        CompileAssert(sizeof(size_t) == 8);
-        return FitsInDWord((int64)value);
-#endif
-    }
+    static bool     FitsInDWord(size_t value) { return ((size_t)(signed int)(value & 0xFFFFFFFF) == value); }
+    static bool     FitsInDWord(int64 value) { return FitsInDWord((size_t)value); }
 
     static UINT_PTR Rand();
     static bool     IsPow2(int32 val) { return (val > 0 && ((val-1) & val) == 0); }

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ Security::EncodeOpnd(IR::Instr instr, IR::Opnd opnd)`
`240`	`240`	`{`
`241`	`241`	`IR::IntConstOpnd *intConstOpnd = opnd->AsIntConstOpnd();`
`242`	`242`
`243`		`- if (!this->IsLargeConstant(intConstOpnd->AsInt32()))`
	`243`	`+ if (!this->IsLargeConstant(intConstOpnd->GetValue()))`
`244`	`244`	`{`
`245`	`245`	`return;`
`246`	`246`	`}`