[Lldb-commits] [lldb] r105918 - in /lldb/trunk: llvm.zip scripts/build-llvm.pl source/Expression/ClangExpression.cpp source/Symbol/ClangASTContext.cpp

[Greg Clayton]

Author: gclayton
Date: Sun Jun 13 12:34:29 2010
New Revision: 105918

URL: http://llvm.org/viewvc/llvm-project?rev=105918&view=rev
Log:
Updated LLVM/Clang to revision from 2010-06-13T06:00.


Modified:
    lldb/trunk/llvm.zip
    lldb/trunk/scripts/build-llvm.pl
    lldb/trunk/source/Expression/ClangExpression.cpp
    lldb/trunk/source/Symbol/ClangASTContext.cpp

Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=105918&r1=105917&r2=105918&view=diff
==============================================================================
Binary files - no diff available.

Modified: lldb/trunk/scripts/build-llvm.pl
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=105918&r1=105917&r2=105918&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Sun Jun 13 12:34:29 2010
@@ -25,7 +25,7 @@
 
 our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
 
-our $llvm_revision = "'{2010-06-01T13:00}'";
+our $llvm_revision = "'{2010-06-13T06:00}'";
 our $llvm_source_dir = "$ENV{SRCROOT}";
 our $cc = "$ENV{DEVELOPER_BIN_DIR}/gcc-4.2";
 our $cxx = "$ENV{DEVELOPER_BIN_DIR}/g++-4.2";

Modified: lldb/trunk/source/Expression/ClangExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpression.cpp?rev=105918&r1=105917&r2=105918&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpression.cpp Sun Jun 13 12:34:29 2010
@@ -567,7 +567,6 @@
 //            compiler_instance->getFrontendOpts().ProgramAction = frontend::FixIt;
 
         for (unsigned i = 0, e = m_clang_ap->getFrontendOpts().Inputs.size(); i != e; ++i) {
-            const std::string &InFile = m_clang_ap->getFrontendOpts().Inputs[i].second;
 
             // If we aren't using an AST file, setup the file and source managers and
             // the preprocessor.
@@ -592,7 +591,9 @@
             if (!Act)
                 break;
 
-            if (Act->BeginSourceFile(*m_clang_ap, InFile, IsAST)) {
+            if (Act->BeginSourceFile(*m_clang_ap, 
+                                     m_clang_ap->getFrontendOpts().Inputs[i].second, 
+                                     m_clang_ap->getFrontendOpts().Inputs[i].first)) {
                 Act->Execute();
                 Act->EndSourceFile();
             }

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=105918&r1=105917&r2=105918&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Sun Jun 13 12:34:29 2010
@@ -39,7 +39,7 @@
 ParseLangArgs
 (
     LangOptions &Opts,
-    FrontendOptions::InputKind IK
+    InputKind IK
 )
 {
     // FIXME: Cleanup per-file based stuff.
@@ -47,12 +47,12 @@
     // Set some properties which depend soley on the input kind; it would be nice
     // to move these to the language standard, and have the driver resolve the
     // input kind + language standard.
-    if (IK == FrontendOptions::IK_Asm) {
+    if (IK == IK_Asm) {
         Opts.AsmPreprocessor = 1;
-    } else if (IK == FrontendOptions::IK_ObjC ||
-               IK == FrontendOptions::IK_ObjCXX ||
-               IK == FrontendOptions::IK_PreprocessedObjC ||
-               IK == FrontendOptions::IK_PreprocessedObjCXX) {
+    } else if (IK == IK_ObjC ||
+               IK == IK_ObjCXX ||
+               IK == IK_PreprocessedObjC ||
+               IK == IK_PreprocessedObjCXX) {
         Opts.ObjC1 = Opts.ObjC2 = 1;
     }
 
@@ -61,23 +61,23 @@
     if (LangStd == LangStandard::lang_unspecified) {
         // Based on the base language, pick one.
         switch (IK) {
-            case FrontendOptions::IK_None:
-            case FrontendOptions::IK_AST:
+            case IK_None:
+            case IK_AST:
                 assert(0 && "Invalid input kind!");
-            case FrontendOptions::IK_OpenCL:
+            case IK_OpenCL:
                 LangStd = LangStandard::lang_opencl;
                 break;
-            case FrontendOptions::IK_Asm:
-            case FrontendOptions::IK_C:
-            case FrontendOptions::IK_PreprocessedC:
-            case FrontendOptions::IK_ObjC:
-            case FrontendOptions::IK_PreprocessedObjC:
+            case IK_Asm:
+            case IK_C:
+            case IK_PreprocessedC:
+            case IK_ObjC:
+            case IK_PreprocessedObjC:
                 LangStd = LangStandard::lang_gnu99;
                 break;
-            case FrontendOptions::IK_CXX:
-            case FrontendOptions::IK_PreprocessedCXX:
-            case FrontendOptions::IK_ObjCXX:
-            case FrontendOptions::IK_PreprocessedObjCXX:
+            case IK_CXX:
+            case IK_PreprocessedCXX:
+            case IK_ObjCXX:
+            case IK_PreprocessedObjCXX:
                 LangStd = LangStandard::lang_gnucxx98;
                 break;
         }
@@ -331,8 +331,8 @@
     if (m_language_options_ap.get() == NULL)
     {
         m_language_options_ap.reset(new LangOptions());
-        ParseLangArgs(*m_language_options_ap, FrontendOptions::IK_ObjCXX);
-//        InitializeLangOptions(*m_language_options_ap, FrontendOptions::IK_ObjCXX);
+        ParseLangArgs(*m_language_options_ap, IK_ObjCXX);
+//        InitializeLangOptions(*m_language_options_ap, IK_ObjCXX);
     }
     return m_language_options_ap.get();
 }