commit a3a037df6342bd0cb60749ad5e824b708e5e05f4
author Alexey Samsonov <samsonov@google.com> Wed Aug 28 08:30:47 2013 +0000
committer Alexey Samsonov <samsonov@google.com> Wed Aug 28 08:30:47 2013 +0000
tree eb287106fc4ad8e7dfb65692af9b435198ad5423
parent ed8f1c6dce6f82fda1477d668d798ac01d491367

Fix use of uninitialized value added in r189400 (found by MemorySanitizer)

llvm-svn: 189456

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp

diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
index 633cd36..d7e8402 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
@@ -54,7 +54,7 @@
                                      const MCAsmLayout *Layout) const {
   MCValue Value;
 
-  if (Layout && !getSubExpr()->EvaluateAsRelocatable(Value, *Layout))
+  if (!Layout || !getSubExpr()->EvaluateAsRelocatable(Value, *Layout))
     return false;
 
   if (Value.isAbsolute()) {
@@ -85,7 +85,7 @@
         break;
     }
     Res = MCValue::get(Result);
-  } else if (Layout) {
+  } else {
     MCContext &Context = Layout->getAssembler().getContext();
     const MCSymbolRefExpr *Sym = Value.getSymA();
     MCSymbolRefExpr::VariantKind Modifier = Sym->getKind();
@@ -118,8 +118,7 @@
     }
     Sym = MCSymbolRefExpr::Create(&Sym->getSymbol(), Modifier, Context);
     Res = MCValue::get(Sym, Value.getSymB(), Value.getConstant());
-  } else
-    return false;
+  }
 
   return true;
 }