Fix InstCombine/2007-10-31-StringCrash.ll by removing an obvious

(in hindsight) infinite recursion.  Simplify the code.

llvm-svn: 43597

1 files changed, 8 insertions, 12 deletions

diff --git a/llvm/lib/VMCore/Constants.cpp b/llvm/lib/VMCore/Constants.cpp
index 262595fc8f3..74f62874501 100644
--- a/llvm/lib/VMCore/Constants.cpp
+++ b/llvm/lib/VMCore/Constants.cpp
@@ -2268,18 +2268,14 @@ std::string Constant::getStringValue(bool Chop, unsigned Offset) {
         }
       }
     }
-  } else if (Constant *C = dyn_cast<Constant>(this)) {
-    if (GlobalValue *GV = dyn_cast<GlobalValue>(C))
-      return GV->getStringValue(Chop, Offset);
-    else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C)) {
-      if (CE->getOpcode() == Instruction::GetElementPtr) {
-        // Turn a gep into the specified offset.
-        if (CE->getNumOperands() == 3 &&
-            cast<Constant>(CE->getOperand(1))->isNullValue() &&
-            isa<ConstantInt>(CE->getOperand(2))) {
-          Offset += cast<ConstantInt>(CE->getOperand(2))->getZExtValue();
-          return CE->getOperand(0)->getStringValue(Chop, Offset);
-        }
+  } else if (ConstantExpr *CE = dyn_cast<ConstantExpr>(this)) {
+    if (CE->getOpcode() == Instruction::GetElementPtr) {
+      // Turn a gep into the specified offset.
+      if (CE->getNumOperands() == 3 &&
+          cast<Constant>(CE->getOperand(1))->isNullValue() &&
+          isa<ConstantInt>(CE->getOperand(2))) {
+        Offset += cast<ConstantInt>(CE->getOperand(2))->getZExtValue();
+        return CE->getOperand(0)->getStringValue(Chop, Offset);
       }
     }
   }