Fix DISABLE_SMART_POINTERS build

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@92008 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Parse/Ownership.h b/include/clang/Parse/Ownership.h
index 5eb9635f06a1d1b771bf249354f5b4d0e2b725b2..ed1b068f8140a08269d4d8e75f0a71d148ca09ee 100644 (file)
--- a/include/clang/Parse/Ownership.h
+++ b/include/clang/Parse/Ownership.h
@@ -166,7 +166,7 @@ namespace llvm {
 // conversions.
 
 // Flip this switch to measure performance impact of the smart pointers.
-//#define DISABLE_SMART_POINTERS
+#define DISABLE_SMART_POINTERS
 
 namespace llvm {
   template<>

diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index 8b5a72de361dbf4ef55ea6c413f1edf8c0ae428a..d932f21f79ab28d1b1ff87c6a1dfbdef63c549fb 100644 (file)
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -5001,14 +5001,15 @@ Sema::OwningExprResult Sema::CreateOverloadedUnaryOp(SourceLocation OpLoc,
           return ExprError();
       } else {
         // Convert the arguments.
-        input = PerformCopyInitialization(
-                                     InitializedEntity::InitializeParameter(
+        OwningExprResult InputInit
+          = PerformCopyInitialization(InitializedEntity::InitializeParameter(
                                                       FnDecl->getParamDecl(0)),
-                                          SourceLocation(), 
-                                          move(input));
-        if (input.isInvalid())
+                                      SourceLocation(), 
+                                      move(input));
+        if (InputInit.isInvalid())
           return ExprError();
         
+        input = move(InputInit);
         Input = (Expr *)input.get();
       }
 

diff --git a/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg b/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg
index 6676e311e3ecd016edb355e375675c91510c6311..b9931144a3d97f051bf0642fa2b47e8ed20ec981 100644 (file)
--- a/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg
+++ b/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg
@@ -11,6 +11,7 @@ root = getRoot(config)
 
 # testFormat: The test format to use to interpret tests.
 target_obj_root = root.llvm_obj_root
+target_obj_root = '/Users/dgregor/Projects/llvm-build-autotools'
 cxxflags = ['-D__STDC_LIMIT_MACROS',
             '-D__STDC_CONSTANT_MACROS',
             '-Wno-sign-compare',

diff --git a/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg b/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg
index 6e679659c44c916e4e3fc5974f5b64b68b5dd8da..a2b5b7b036331c83b1e49f3ca6e01335c18939b6 100644 (file)
--- a/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg
+++ b/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg
@@ -11,6 +11,7 @@ root = getRoot(config)
 
 # testFormat: The test format to use to interpret tests.
 target_obj_root = root.llvm_obj_root
+target_obj_root = '/Users/dgregor/Projects/llvm-build-autotools'
 cxxflags = ['-D__STDC_LIMIT_MACROS',
             '-D__STDC_CONSTANT_MACROS',
             '-I%s/include' % root.llvm_src_root,
@@ -49,6 +50,6 @@ cxxflags = ['-D__STDC_LIMIT_MACROS',
 config.test_format = \
   lit.formats.OneCommandPerFileTest(command=[root.clang,
                                              '-fsyntax-only'] + cxxflags,
-                                    dir='%s/lib' % root.llvm_src_root,
+                                    dir='%s' % root.llvm_src_root,
                                     recursive=True,
                                     pattern='^(.*\\.cpp)$')