diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
index 262549a2e97..06544bfaf6c 100644
--- a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
@@ -394,6 +394,7 @@ static const TargetRegisterClass *getPhysicalRegisterRegClass(
     if ((*I)->hasType(VT) && (*I)->contains(reg))
       return *I;
   assert(false && "Couldn't find the register class");
+  return 0;
 }
 
 /// EmitNode - Generate machine code for an node and needed dependencies.
diff --git a/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/lib/Transforms/Scalar/LoopStrengthReduce.cpp
index bd74902c53c..43531340938 100644
--- a/lib/Transforms/Scalar/LoopStrengthReduce.cpp
+++ b/lib/Transforms/Scalar/LoopStrengthReduce.cpp
@@ -44,7 +44,7 @@ STATISTIC(NumVariable, "Number of PHIs with variable strides");
 
 namespace {
 
-  class BasedUser;
+  struct BasedUser;
 
   /// IVStrideUse - Keep track of one use of a strided induction variable, where
   /// the stride is stored externally.  The Offset member keeps track of the