[cfe-commits] r92008 - in /cfe/trunk: include/clang/Parse/Ownership.h lib/Sema/SemaOverload.cpp utils/C++Tests/LLVM-Code-Compile/lit.local.cfg utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg

[Douglas Gregor]

Author: dgregor
Date: Wed Dec 23 11:40:29 2009
New Revision: 92008

URL: http://llvm.org/viewvc/llvm-project?rev=92008&view=rev
Log:
Fix DISABLE_SMART_POINTERS build

Modified:
    cfe/trunk/include/clang/Parse/Ownership.h
    cfe/trunk/lib/Sema/SemaOverload.cpp
    cfe/trunk/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg
    cfe/trunk/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg

Modified: cfe/trunk/include/clang/Parse/Ownership.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Ownership.h?rev=92008&r1=92007&r2=92008&view=diff

==============================================================================
--- cfe/trunk/include/clang/Parse/Ownership.h (original)
+++ cfe/trunk/include/clang/Parse/Ownership.h Wed Dec 23 11:40:29 2009
@@ -166,7 +166,7 @@
 // conversions.
 
 // Flip this switch to measure performance impact of the smart pointers.
-//#define DISABLE_SMART_POINTERS
+#define DISABLE_SMART_POINTERS
 
 namespace llvm {
   template<>

Modified: cfe/trunk/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOverload.cpp?rev=92008&r1=92007&r2=92008&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaOverload.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOverload.cpp Wed Dec 23 11:40:29 2009
@@ -5001,14 +5001,15 @@
           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();
       }
 

Modified: cfe/trunk/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/C%2B%2BTests/LLVM-Code-Compile/lit.local.cfg?rev=92008&r1=92007&r2=92008&view=diff

==============================================================================
--- cfe/trunk/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg (original)
+++ cfe/trunk/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg Wed Dec 23 11:40:29 2009
@@ -11,6 +11,7 @@
 
 # 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',

Modified: cfe/trunk/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/C%2B%2BTests/LLVM-Code-Syntax/lit.local.cfg?rev=92008&r1=92007&r2=92008&view=diff

==============================================================================
--- cfe/trunk/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg (original)
+++ cfe/trunk/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg Wed Dec 23 11:40:29 2009
@@ -11,6 +11,7 @@
 
 # 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 @@
 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)$')