2 files changed, 9 insertions, 0 deletions
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
index a7e49d0efcd..49c76a89d86 100644
--- a/clang/lib/AST/Expr.cpp
+++ b/clang/lib/AST/Expr.cpp
@@ -1236,6 +1236,11 @@ int64_t UnaryOperator::evaluateOffsetOf(ASTContext& C) const
   return ::evaluateOffsetOf(C, cast<Expr>(Val)) / CharSize;
 }
 
+void SizeOfAlignOfTypeExpr::Destroy(ASTContext& C) {
+  // Override default behavior of traversing children. We do not want
+  // to delete the type.
+}
+
 //===----------------------------------------------------------------------===//
 //  Child Iterators for iterating over subexpressions/substatements
 //===----------------------------------------------------------------------===//
diff --git a/clang/lib/CodeGen/CodeGenTypes.cpp b/clang/lib/CodeGen/CodeGenTypes.cpp
index 1cdd798a397..e302f2b9ec9 100644
--- a/clang/lib/CodeGen/CodeGenTypes.cpp
+++ b/clang/lib/CodeGen/CodeGenTypes.cpp
@@ -352,6 +352,10 @@ const llvm::Type *CodeGenTypes::ConvertNewType(QualType T) {
     TheModule.addTypeName(TypeName, Res);  
     return Res;
   }
+
+  case Type::BlockPointer: {
+    assert(0 && "FIXME: Cannot get type of block pointer.");
+  }
   }
   
   // FIXME: implement.