Merge "Add back version info to Script in libbcc"

am: cfb3604f23

Change-Id: I14ae0a759195d22f0ef1d07eb2620ea834502128

3 files changed, 11 insertions, 0 deletions

diff --git a/include/bcc/Script.h b/include/bcc/Script.h
index 62c7369..ad18ac6 100644
--- a/include/bcc/Script.h
+++ b/include/bcc/Script.h
@@ -39,6 +39,9 @@ private:
   // TODO(jeanluc) Verify that the lifetime is managed correctly.
   Source *mSource;
 
+  // Currently unused.  Will be used in an upcoming CL to fix small_struct bug.
+  unsigned mCompilerVersion;
+
   llvm::CodeGenOpt::Level mOptimizationLevel;
 
   RSLinkRuntimeCallback mLinkRuntimeCallback;
@@ -60,6 +63,12 @@ public:
 
   bool LinkRuntime(const char *rt_path);
 
+  void setCompilerVersion(unsigned pCompilerVersion) {
+    mCompilerVersion = pCompilerVersion;
+  }
+
+  unsigned getCompilerVersion() const { return mCompilerVersion; }
+
   void setOptimizationLevel(llvm::CodeGenOpt::Level pOptimizationLevel) {
     mOptimizationLevel = pOptimizationLevel;
   }
diff --git a/lib/RSCompilerDriver.cpp b/lib/RSCompilerDriver.cpp
index 09c4227..9f04a7f 100644
--- a/lib/RSCompilerDriver.cpp
+++ b/lib/RSCompilerDriver.cpp
@@ -276,6 +276,7 @@ bool RSCompilerDriver::build(BCCContext &pContext,
 
   // Read information from bitcode wrapper.
   bcinfo::BitcodeWrapper wrapper(pBitcode, pBitcodeSize);
+  script.setCompilerVersion(wrapper.getCompilerVersion());
   script.setOptimizationLevel(static_cast<llvm::CodeGenOpt::Level>(
                               wrapper.getOptimizationLevel()));
 
diff --git a/lib/Script.cpp b/lib/Script.cpp
index fad070d..6381b34 100644
--- a/lib/Script.cpp
+++ b/lib/Script.cpp
@@ -26,6 +26,7 @@ using namespace bcc;
 
 Script::Script(Source *pSource)
     : mSource(pSource),
+      mCompilerVersion(0),
       mOptimizationLevel(llvm::CodeGenOpt::Aggressive),
       mLinkRuntimeCallback(nullptr), mEmbedInfo(false), mEmbedGlobalInfo(false),
       mEmbedGlobalInfoSkipConstant(false) {}