Subzero: Fix the g++ build (e.g. Windows).

src/IceOperand.cpp

 //===- subzero/src/IceOperand.cpp - High-level operand implementation -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the Operand class and its target-independent
@@ skipping 234 matching lines @@
 
 const Inst *VariableTracking::getFirstDefinition() const {
   switch (MultiDef) {
   case MDS_Unknown:
   case MDS_MultiDefMultiBlock:
     return NULL;
   case MDS_SingleDef:
   case MDS_MultiDefSingleBlock:
     assert(FirstOrSingleDefinition);
     return FirstOrSingleDefinition;
   }

[Karl, 2014/12/04 21:58:15]

nullptr?

[Jim Stichnoth, 2014/12/04 22:09:15]

I actually meant to keep it NULL to be consistent with the rest of the file.  I
was meaning to do a nullptr pass over the entire code base at some point.

+  return NULL;
 }
 
 const Inst *VariableTracking::getSingleDefinition() const {
   switch (MultiDef) {
   case MDS_Unknown:
   case MDS_MultiDefMultiBlock:
   case MDS_MultiDefSingleBlock:
     return NULL;
   case MDS_SingleDef:
     assert(FirstOrSingleDefinition);
     return FirstOrSingleDefinition;
   }
+  return NULL;

[Karl, 2014/12/04 21:58:15]

nullptr?

 }
 
 void VariablesMetadata::init(MetadataKind TrackingKind) {
   TimerMarker T(TimerStack::TT_vmetadata, Func);
   Kind = TrackingKind;
   Metadata.clear();
   Metadata.resize(Func->getNumVariables());
 
   // Mark implicit args as being used in the entry node.
   for (Variable *Var : Func->getImplicitArgs()) {
@@ skipping 209 matching lines @@
   if (!ALLOW_DUMP)
     return Str;
   if (W.getWeight() == RegWeight::Inf)
     Str << "Inf";
   else
     Str << W.getWeight();
   return Str;
 }
 
 } // end of namespace Ice