diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-12-23 17:40:29 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-12-23 17:40:29 +0000 |
| commit | e6600379b1c6fcf3ecc0ed780cdb5ea6e8cdda2e (patch) | |
| tree | 80f95377ff5823d84b8f242d1a461afdb1635be6 | |
| parent | 13468371a7cda42f6e5c48937d181a3e421b1fd2 (diff) | |
| download | bcm5719-llvm-e6600379b1c6fcf3ecc0ed780cdb5ea6e8cdda2e.tar.gz bcm5719-llvm-e6600379b1c6fcf3ecc0ed780cdb5ea6e8cdda2e.zip | |
Fix DISABLE_SMART_POINTERS build
llvm-svn: 92008
| -rw-r--r-- | clang/include/clang/Parse/Ownership.h | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 11 | ||||
| -rw-r--r-- | clang/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg | 1 | ||||
| -rw-r--r-- | clang/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/clang/include/clang/Parse/Ownership.h b/clang/include/clang/Parse/Ownership.h index 5eb9635f06a..ed1b068f814 100644 --- a/clang/include/clang/Parse/Ownership.h +++ b/clang/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/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 8b5a72de361..d932f21f79a 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/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/clang/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg b/clang/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg index 6676e311e3e..b9931144a3d 100644 --- a/clang/utils/C++Tests/LLVM-Code-Compile/lit.local.cfg +++ b/clang/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/clang/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg b/clang/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg index 6e679659c44..a2b5b7b0363 100644 --- a/clang/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg +++ b/clang/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)$') |
