[llvm-commits] [llvm] r62352 - /llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp

[Chris Lattner]

Author: lattner
Date: Fri Jan 16 14:17:02 2009
New Revision: 62352

URL: http://llvm.org/viewvc/llvm-project?rev=62352&view=rev
Log:
don't assert and die on out of range (undefined) shifts.  This fixes
PR3334.

Modified:
    llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp

Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp?rev=62352&r1=62351&r2=62352&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/Execution.cpp Fri Jan 16 14:17:02 2009
@@ -927,7 +927,11 @@
   GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
   GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
   GenericValue Dest;
-  Dest.IntVal = Src1.IntVal.shl(Src2.IntVal.getZExtValue());
+  if (Src2.IntVal.getZExtValue() < Src1.IntVal.getBitWidth())
+    Dest.IntVal = Src1.IntVal.shl(Src2.IntVal.getZExtValue());
+  else
+    Dest.IntVal = Src1.IntVal;
+  
   SetValue(&I, Dest, SF);
 }
 
@@ -936,7 +940,11 @@
   GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
   GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
   GenericValue Dest;
-  Dest.IntVal =  Src1.IntVal.lshr(Src2.IntVal.getZExtValue());
+  if (Src2.IntVal.getZExtValue() < Src1.IntVal.getBitWidth())
+    Dest.IntVal = Src1.IntVal.lshr(Src2.IntVal.getZExtValue());
+  else
+    Dest.IntVal = Src1.IntVal;
+  
   SetValue(&I, Dest, SF);
 }
 
@@ -944,8 +952,12 @@
   ExecutionContext &SF = ECStack.back();
   GenericValue Src1 = getOperandValue(I.getOperand(0), SF);
   GenericValue Src2 = getOperandValue(I.getOperand(1), SF);
-  GenericValue Dest; 
-  Dest.IntVal = Src1.IntVal.ashr(Src2.IntVal.getZExtValue());
+  GenericValue Dest;
+  if (Src2.IntVal.getZExtValue() < Src1.IntVal.getBitWidth())
+    Dest.IntVal = Src1.IntVal.ashr(Src2.IntVal.getZExtValue());
+  else
+    Dest.IntVal = Src1.IntVal;
+  
   SetValue(&I, Dest, SF);
 }