vgvassilev · maddouri · Nov 6, 2014 · Nov 6, 2014 · Nov 20, 2014 · Dec 2, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -6,32 +6,22 @@ compiler:
 before_install:
   - echo $LANG
   - echo $LC_ALL
-  - sudo apt-get install python-software-properties
   - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
   - sudo apt-get update
-  - sudo apt-get install gcc-4.8
-  - sudo apt-get install g++-4.8
-  - sudo apt-get install binutils-gold
+  - sudo apt-get install git gcc-4.8 g++-4.8 debhelper devscripts gnupg python binutils-gold python-software-properties
   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
+  - wget https://raw.githubusercontent.com/vgvassilev/cling/master/tools/packaging/cpt.py
+  - chmod +x cpt.py
 
 before_script:
-  - mkdir src inst obj
-  - git clone https://github.com/vgvassilev/llvm.git src
-  - (cd src && git checkout cling-patches)
-  - git clone https://github.com/vgvassilev/clang.git src/tools/clang
-  - (cd src/tools/clang && git checkout cling-patches)
-  - git clone https://github.com/vgvassilev/cling.git src/tools/cling
-  - cd src
-  - cd ../obj
-  - travis_retry ../src/configure --prefix=`pwd`/../inst --disable-docs --disable-bindings --disable-visibility-inlines-hidden --disable-clang-rewriter --disable-clang-static-analyzer --disable-clang-arcmt --disable-compiler-version-checks --enable-targets=host
+  # Perform a sanity check before proceeding
+  - echo "no" | ./cpt.py -c
 
 script:
-  - travis_retry make -j4 -k
-  - travis_retry make -j4 -k
-  - travis_retry make install
-  - cd tools/cling
-  - make test LIT_ARGS=--no-progress-bar
+  # FIXME: Change URLs to the repo of @vgvassilev after repositories have been updated.
+  # Remove --no-test option when appropriate.
+  - ./cpt.py --create-dev-env=release --no-test --with-llvm-url=https://github.com/onyb/llvm --with-clang-url=https://github.com/onyb/clang --with-cling-url=http://root.cern.ch/git/cling.git
 
 branches:
   only:
@@ -40,17 +30,14 @@ branches:
 notifications:
   recipients:
     - [email protected]
+    - [email protected]
     #- [email protected]
-
   email:
     on_success: change
     on_failure: always
-  #irc:
-  #channels:
-    #- "chat.freenode.net#rubinius"
+
   template:
     - "%{repository}/%{branch} (%{commit} - %{author}): %{message}"
 
 os:
-  - linux
-#  - osx
+  - linux
diff --git a/include/cling/Interpreter/Value.h b/include/cling/Interpreter/Value.h
@@ -10,6 +10,8 @@
 #ifndef CLING_VALUE_H
 #define CLING_VALUE_H
 
+#include <stddef.h>
+
 namespace llvm {
   class raw_ostream;
 }
@@ -101,7 +103,7 @@ namespace cling {
         case kLongDoubleType:
           return (T) V.getAs<long double>();
         case kPointerType:
-          return (T) (unsigned long) V.getAs<void*>();
+          return (T) (size_t) V.getAs<void*>();
         case kUnsupportedType:
           V.AssertOnUnsupportedTypeCast();
         }
@@ -115,7 +117,7 @@ namespace cling {
         EStorageType storageType = V.getStorageType();
         switch (storageType) {
         case kPointerType:
-          return (T*) (unsigned long) V.getAs<void*>();
+          return (T*) (size_t) V.getAs<void*>();
         default:
           V.AssertOnUnsupportedTypeCast(); break;
         }

diff --git a/lib/Interpreter/BackendPass.cpp b/lib/Interpreter/BackendPass.cpp
@@ -58,16 +58,16 @@ namespace {
     InlineCost getInlineCost(CallSite CS) {
       return m_Inliner->getInlineCost(CS);
     }
-    void getAnalysisUsage(AnalysisUsage &AU) const {
+    void getAnalysisUsage(AnalysisUsage &AU) const override {
       m_Inliner->getAnalysisUsage(AU);
     }
-    bool runOnSCC(CallGraphSCC &SCC) {
+    bool runOnSCC(CallGraphSCC &SCC) override {
       return m_Inliner->runOnSCC(SCC);
     }
 
     using llvm::Pass::doFinalization;
     // No-op: we need to keep the inlined functions for later use.
-    bool doFinalization(CallGraph& /*CG*/) {
+    bool doFinalization(CallGraph& /*CG*/) override {
       // Module is unchanged
       return false;
     }

diff --git a/lib/Interpreter/DynamicLibraryManager.cpp b/lib/Interpreter/DynamicLibraryManager.cpp
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <Windows.h>
 #include <shlobj.h>
 #else

diff --git a/lib/Interpreter/IncrementalParser.cpp b/lib/Interpreter/IncrementalParser.cpp
@@ -35,6 +35,7 @@
 #include "clang/Parse/Parser.h"
 #include "clang/Lex/Preprocessor.h"
 #include "clang/Frontend/CompilerInstance.h"
+#include "clang/Sema/Sema.h"
 #include "clang/Serialization/ASTWriter.h"
 
 #include "llvm/IR/LLVMContext.h"
@@ -755,6 +756,8 @@ namespace cling {
     PP.EnterSourceFile(FID, /*DirLookup*/0, NewLoc);
     m_Consumer->getTransaction()->setBufferFID(FID);
 
+    Sema::SavePendingInstantiationsRAII SavedPendingInstantiations(S);
+
     Parser::DeclGroupPtrTy ADecl;
 
     while (!m_Parser->ParseTopLevelDecl(ADecl)) {

diff --git a/lib/Interpreter/Interpreter.cpp b/lib/Interpreter/Interpreter.cpp
@@ -940,7 +940,9 @@ namespace cling {
       return Interpreter::kFailure;
     }
 
-    // Even if the transaction was empty it is still success.
+    // Even if the transaction was empty it can still be a success.
+    if (getCI()->getDiagnostics().hasErrorOccurred())
+      return Interpreter::kFailure;
     return Interpreter::kSuccess;
   }
 

diff --git a/lib/Interpreter/LookupHelper.cpp b/lib/Interpreter/LookupHelper.cpp
@@ -1511,6 +1511,7 @@ namespace cling {
       //  Parse the arguments now.
       //
 
+      Interpreter::PushTransactionRAII TforDeser(Interp);
       ParserStateRAII ResetParserState(P);
       prepareForParsing(P,Interp,
                         funcArgs, llvm::StringRef("func.args.file"), diagOnOff);

diff --git a/lib/Interpreter/MultiplexInterpreterCallbacks.h b/lib/Interpreter/MultiplexInterpreterCallbacks.h
@@ -49,7 +49,7 @@ namespace cling {
       return result;
     }
 
-     bool LookupObject(clang::LookupResult& LR, clang::Scope* S) {
+     bool LookupObject(clang::LookupResult& LR, clang::Scope* S) override {
        bool result = false;
        for (InterpreterCallbacks* cb : m_Callbacks)
          result = cb->LookupObject(LR, S) || result;

diff --git a/lib/Interpreter/Value.cpp b/lib/Interpreter/Value.cpp
@@ -248,15 +248,21 @@ namespace cling {
       namestr << "__cling_StoredValue_Destruct_" << RD;
     }
 
-    std::string code("extern \"C\" void ");
-    {
+    // Check whether the function exists before calling
+    // utils::TypeName::GetFullyQualifiedName which is expensive
+    // (memory-wise). See ROOT-6909.
+    std::string code;
+    if (!m_Interpreter->getAddressOfGlobal(funcname)) {
+      code = "extern \"C\" void ";
       clang::QualType RDQT(RD->getTypeForDecl(), 0);
       std::string typeName
         = utils::TypeName::GetFullyQualifiedName(RDQT, RD->getASTContext());
       std::string dtorName = RD->getNameAsString();
       code += funcname + "(void* obj){((" + typeName + "*)obj)->~"
         + dtorName + "();}";
     }
+    // else we have an empty code string - but the function alreday exists
+    // so we'll be fine and take the existing one (ifUniq = true).
 
     return m_Interpreter->compileFunction(funcname, code, true /*ifUniq*/,
                                           false /*withAccessControl*/);

diff --git a/lib/UserInterface/textinput/SignalHandler.cpp b/lib/UserInterface/textinput/SignalHandler.cpp
@@ -26,7 +26,7 @@ namespace textinput {
 
   void
   SignalHandler::EmitCtrlZ() {
-#ifndef WIN32
+#ifndef _WIN32
     raise(SIGTSTP);
 #endif
   }

diff --git a/lib/UserInterface/textinput/StreamReader.cpp b/lib/UserInterface/textinput/StreamReader.cpp
@@ -14,7 +14,7 @@
 
 #include "textinput/StreamReader.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 # include "textinput/StreamReaderWin.h"
 #else
 # include "textinput/StreamReaderUnix.h"
@@ -25,7 +25,7 @@ namespace textinput {
 
   StreamReader*
   StreamReader::Create() {
-#ifdef WIN32
+#ifdef _WIN32
      return new StreamReaderWin();
 #else
      return new StreamReaderUnix();

diff --git a/lib/UserInterface/textinput/StreamReaderUnix.cpp b/lib/UserInterface/textinput/StreamReaderUnix.cpp
@@ -13,7 +13,7 @@
 //  Axel Naumann <[email protected]>, 2011-05-12
 //===----------------------------------------------------------------------===//
 
-#ifndef WIN32
+#ifndef _WIN32
 
 #include "textinput/StreamReaderUnix.h"
 
@@ -274,4 +274,4 @@ namespace textinput {
   }
 }
 
-#endif // ifndef WIN32
+#endif // ifndef _WIN32
diff --git a/lib/UserInterface/textinput/StreamReaderWin.cpp b/lib/UserInterface/textinput/StreamReaderWin.cpp
@@ -12,7 +12,7 @@
 //  Axel Naumann <[email protected]>, 2011-05-12
 //===----------------------------------------------------------------------===//
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #include "textinput/StreamReaderWin.h"
 
@@ -211,4 +211,4 @@ namespace textinput {
     }
   }
 }
-#endif // WIN32
+#endif // _WIN32
diff --git a/lib/UserInterface/textinput/TerminalConfigUnix.cpp b/lib/UserInterface/textinput/TerminalConfigUnix.cpp
@@ -1,4 +1,4 @@
-#ifndef WIN32
+#ifndef _WIN32
 
 //===--- TerminalConfigUnix.cpp - termios storage -------------*- C++ -*-===//
 //
@@ -143,4 +143,4 @@ bool TerminalConfigUnix::IsInteractive() const {
 
 
 
-#endif // ndef WIN32
+#endif // ifndef _WIN32
diff --git a/lib/UserInterface/textinput/TerminalDisplay.cpp b/lib/UserInterface/textinput/TerminalDisplay.cpp
@@ -14,7 +14,7 @@
 
 #include "textinput/TerminalDisplay.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "textinput/TerminalDisplayWin.h"
 #else
 #include "textinput/TerminalDisplayUnix.h"
@@ -30,7 +30,7 @@ namespace textinput {
 
   TerminalDisplay*
   TerminalDisplay::Create() {
-#ifdef WIN32
+#ifdef _WIN32
     return new TerminalDisplayWin();
 #else
     return new TerminalDisplayUnix();

diff --git a/lib/UserInterface/textinput/TerminalDisplayUnix.cpp b/lib/UserInterface/textinput/TerminalDisplayUnix.cpp
@@ -1,4 +1,4 @@
-#ifndef WIN32
+#ifndef _WIN32
 
 //===--- TerminalDisplayUnix.cpp - Output To UNIX Terminal ------*- C++ -*-===//
 //
@@ -326,4 +326,4 @@ namespace textinput {
 
 }
 
-#endif // #ifndef WIN32
+#endif // #ifndef _WIN32
diff --git a/lib/UserInterface/textinput/TerminalDisplayWin.cpp b/lib/UserInterface/textinput/TerminalDisplayWin.cpp
@@ -13,7 +13,7 @@
 //  Axel Naumann <[email protected]>, 2011-05-12
 //===----------------------------------------------------------------------===//
 
-#ifdef WIN32
+#ifdef _WIN32
 #include "textinput/TerminalDisplayWin.h"
 
 #include "textinput/Color.h"
@@ -214,4 +214,4 @@ namespace textinput {
 
 }
 
-#endif // WIN32
+#endif // ifdef _WIN32
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
@@ -0,0 +1,13 @@
+FROM ubuntu:14.04
+
+# original script: https://github.com/maddouri/cling-ubuntu-docker
+
+ADD ./build-cling.sh /root/build-cling.sh
+
+RUN /usr/bin/env bash /root/build-cling.sh
+
+ENV PATH              "$PATH:/opt/cling/bin"
+ENV CLING             "/opt/cling/bin/cling"
+ENV CLING_COMMIT_SHA1 "/opt/cling/CLING_COMMIT_SHA1"
+
+ENTRYPOINT "/opt/cling/bin/cling"