[cfe-commits] r91325 - in /cfe/trunk: lib/Sema/SemaInit.cpp lib/Sema/SemaInit.h utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg

[Douglas Gregor]

Author: dgregor
Date: Mon Dec 14 14:57:13 2009
New Revision: 91325

URL: http://llvm.org/viewvc/llvm-project?rev=91325&view=rev
Log:
Minor cleanups for constructor initialization in InitializationSequence

Modified:
    cfe/trunk/lib/Sema/SemaInit.cpp
    cfe/trunk/lib/Sema/SemaInit.h
    cfe/trunk/utils/C++Tests/LLVM-Code-Syntax/lit.local.cfg

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaInit.cpp (original)
+++ cfe/trunk/lib/Sema/SemaInit.cpp Mon Dec 14 14:57:13 2009
@@ -2474,7 +2474,7 @@
                                          const InitializationKind &Kind,
                                          Expr **Args, unsigned NumArgs,
                                          InitializationSequence &Sequence) {
-  Sequence.setSequenceKind(InitializationSequence::ConstructorConversion);
+  Sequence.setSequenceKind(InitializationSequence::ConstructorInitialization);
   
   // Build the candidate set directly in the initialization sequence
   // structure, so that it will persist if we fail.
@@ -2885,7 +2885,7 @@
   // we're supposed to start the conversion from the solitary initializer or
   // from the set of arguments.
   if (Kind.getKind() == InitializationKind::IK_Copy ||
-      SequenceKind == ReferenceBinding) {
+      SequenceKind != ConstructorInitialization) {
     assert(Args.size() == 1);
     CurInit = Sema::OwningExprResult(S, Args.release()[0]);
     if (CurInit.isInvalid())

Modified: cfe/trunk/lib/Sema/SemaInit.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.h?rev=91325&r1=91324&r2=91325&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaInit.h (original)
+++ cfe/trunk/lib/Sema/SemaInit.h Mon Dec 14 14:57:13 2009
@@ -307,7 +307,7 @@
     UserDefinedConversion,
     
     /// \brief A constructor call.
-    ConstructorConversion,
+    ConstructorInitialization,
     
     /// \brief A reference binding.
     ReferenceBinding,

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=91325&r1=91324&r2=91325&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 Mon Dec 14 14:57:13 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,