1 files changed, 5 insertions, 2 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 71560fe2ae..4afc3b5c3e 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -2931,8 +2931,11 @@ static bool isMemSrcFromString(SDValue Src, std::string &Str) {
     return false;
 
   GlobalVariable *GV = dyn_cast<GlobalVariable>(G->getGlobal());
-  if (GV && GetConstantStringInfo(GV, Str, SrcDelta, false))
-    return true;
+  if (GV) {
+    const char *SI = GetConstantStringInfo(GV, SrcDelta, false);
+    Str = (SI ? SI : "");
+    if (!Str.empty()) return true;
+  }
 
   return false;
 }