BuildCXXConstructExpr doesn't need to take an ASTContext.

llvm-svn: 79149

1 files changed, 5 insertions, 2 deletions

diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 20f69069a5a..274893b99e9 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -905,8 +905,8 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
     // FIXME: Keep track of whether the copy constructor is elidable or not.
     bool Elidable = (isa<CallExpr>(From) || 
                      isa<CXXTemporaryObjectExpr>(From));
-    From = BuildCXXConstructExpr(Context, ToType, 
-                                 SCS.CopyConstructor, Elidable, &From, 1);
+    From = BuildCXXConstructExpr(ToType, SCS.CopyConstructor, 
+                                 Elidable, &From, 1);
     return false;
   }
 
@@ -1558,6 +1558,9 @@ QualType Sema::FindCompositePointerType(Expr *&E1, Expr *&E2) {
 }
 
 Sema::OwningExprResult Sema::MaybeBindToTemporary(Expr *E) {
+  if (!Context.getLangOptions().CPlusPlus)
+    return Owned(E);
+  
   const RecordType *RT = E->getType()->getAs<RecordType>();
   if (!RT)
     return Owned(E);