2 files changed, 24 insertions, 1 deletions
diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h
index d09c140e14..1b85e91cd0 100644
--- a/include/llvm/Instruction.h
+++ b/include/llvm/Instruction.h
@@ -97,7 +97,13 @@ public:
   bool isCommutative() const { return isCommutative(getOpcode()); }
   static bool isCommutative(unsigned op);
 
-
+  /// isTrappingInstruction - Return true if the instruction may trap.
+  ///
+  bool isTrappingInstruction() const {
+    return isTrappingInstruction(getOpcode()); 
+  }
+  static bool isTrappingInstruction(unsigned op);
+  
   virtual void print(std::ostream &OS) const;
 
   /// Methods for support type inquiry through isa, cast, and dyn_cast:
diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index ce1423a863..a1ccddf416 100644
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -137,3 +137,20 @@ bool Instruction::isCommutative(unsigned op) {
     return false;
   }
 }
+
+
+/// isTrappingInstruction - Return true if the instruction may trap.
+///
+bool Instruction::isTrappingInstruction(unsigned op) {
+  switch(op) {
+  case Div:
+  case Rem:
+  case Load:
+  case Store:
+  case Call:
+  case Invoke:
+    return true;
+  default:
+    return false;
+  }
+}