[llvm-branch-commits] [llvm-branch] r155308 - in /llvm/branches/release_31: ./ lib/Support/YAMLParser.cpp lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp

[Bill Wendling]

Author: void
Date: Sun Apr 22 02:23:44 2012
New Revision: 155308

URL: http://llvm.org/viewvc/llvm-project?rev=155308&view=rev
Log:
Merging r155307:
------------------------------------------------------------------------
r155307 | void | 2012-04-22 00:23:04 -0700 (Sun, 22 Apr 2012) | 1 line

Remove some potential warnings about variables used uninitialized.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_31/   (props changed)
    llvm/branches/release_31/lib/Support/YAMLParser.cpp
    llvm/branches/release_31/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 22 02:23:44 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155230
+/llvm/trunk:155230,155307

Modified: llvm/branches/release_31/lib/Support/YAMLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/lib/Support/YAMLParser.cpp?rev=155308&r1=155307&r2=155308&view=diff
==============================================================================
--- llvm/branches/release_31/lib/Support/YAMLParser.cpp (original)
+++ llvm/branches/release_31/lib/Support/YAMLParser.cpp Sun Apr 22 02:23:44 2012
@@ -1732,7 +1732,7 @@
           if (UnquotedValue.size() < 3)
             // TODO: Report error.
             break;
-          unsigned int UnicodeScalarValue;
+          unsigned int UnicodeScalarValue = 0;
           UnquotedValue.substr(1, 2).getAsInteger(16, UnicodeScalarValue);
           encodeUTF8(UnicodeScalarValue, Storage);
           UnquotedValue = UnquotedValue.substr(2);
@@ -1742,7 +1742,7 @@
           if (UnquotedValue.size() < 5)
             // TODO: Report error.
             break;
-          unsigned int UnicodeScalarValue;
+          unsigned int UnicodeScalarValue = 0;
           UnquotedValue.substr(1, 4).getAsInteger(16, UnicodeScalarValue);
           encodeUTF8(UnicodeScalarValue, Storage);
           UnquotedValue = UnquotedValue.substr(4);
@@ -1752,7 +1752,7 @@
           if (UnquotedValue.size() < 9)
             // TODO: Report error.
             break;
-          unsigned int UnicodeScalarValue;
+          unsigned int UnicodeScalarValue = 0;
           UnquotedValue.substr(1, 8).getAsInteger(16, UnicodeScalarValue);
           encodeUTF8(UnicodeScalarValue, Storage);
           UnquotedValue = UnquotedValue.substr(8);

Modified: llvm/branches/release_31/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp?rev=155308&r1=155307&r2=155308&view=diff
==============================================================================
--- llvm/branches/release_31/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp (original)
+++ llvm/branches/release_31/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp Sun Apr 22 02:23:44 2012
@@ -194,7 +194,7 @@
 
   assert (Kind == MCExpr::SymbolRef);
     
-  Mips::Fixups FixupKind;
+  Mips::Fixups FixupKind = Mips::Fixups(0);
 
   switch(cast<MCSymbolRefExpr>(Expr)->getKind()) {
   case MCSymbolRefExpr::VK_Mips_GPREL: