commit bbf0b0eac5b1aa65ded878d80a0adc83e48527c8
author I-Jui (Ray) Sung <ijsung@google.com> Mon Mar 27 15:33:22 2017 -0700
committer I-Jui (Ray) Sung <ijsung@google.com> Mon Apr 10 14:44:58 2017 -0700
tree 577699797c4c1a774e31466f39559baf61675b12
parent 32c621a863f574584b104ec3bd279f90738c40bf

Fix RSoV compiler regression

c/299496/ revised the protocol between bcc and bcinfo; bcc now injects
some metadata into the module which is in turn parsed by the
bcinfo::MetadataExtractor(Module *) constructor. Since RSoV uses bcinfo
on non-bcc-processed bitcodes, those missing data caused the constructor
to fail.

This CL uses a different MetadataExtractor constructor so that all the
required information are passed to the MetadataExtractor via full bitcode.

Bug: 30964317
Bug: 36657118
Test: RSoV LIT test, RSoVTest on Angler
Change-Id: I9b423ad8d0bcab5d261e595c10d4676486ec4b3b
(cherry picked from commit 56813de7a00f872fad490b1b3fe5ab1b620c1be5)

rsov/compiler/Context.h

diff --git a/rsov/compiler/Context.h b/rsov/compiler/Context.h
index 99f232b..cc86acc 100644
--- a/rsov/compiler/Context.h
+++ b/rsov/compiler/Context.h
@@ -23,19 +23,19 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 
-#include <stdint.h>
 #include <limits>
+#include <stdint.h>
 #include <vector>
 
 // Declare a friend relationship in a class with a test. Used rather that
 // FRIEND_TEST to avoid globally importing gtest/gtest.h into the main
 // RSoV header files.
 #ifdef __HOST__
-#define RSOV_FRIEND_TEST(test_set_name, individual_test)\
-friend class test_set_name##_##individual_test##_Test
+#define RSOV_FRIEND_TEST(test_set_name, individual_test)                       \
+  friend class test_set_name##_##individual_test##_Test
 #else
 #define RSOV_FRIEND_TEST(test_set_name, individual_test)
-#endif  // __HOST__
+#endif // __HOST__
 
 namespace bcinfo {
 class MetadataExtractor;
@@ -60,12 +60,10 @@
 
   // Initialize the internal data struture such as the slot number lookup table,
   // etc.
-  bool Initialize(llvm::Module *M);
+  bool Initialize(std::unique_ptr<bcinfo::MetadataExtractor> ME);
 
   // Returns the total number of exported variables
-  uint32_t getNumExportVar() const {
-    return mExportVarIndices.size();
-  }
+  uint32_t getNumExportVar() const { return mExportVarIndices.size(); }
 
   // Adds the mapping from the slot number of an exported variable to the index
   // of its field in the global buffer
@@ -91,18 +89,14 @@
   }
 
   // Returns the total number of foreach kernels
-  uint32_t getNumForEachKernel() const {
-    return mForEachNameToSlot.size();
-  }
+  uint32_t getNumForEachKernel() const { return mForEachNameToSlot.size(); }
 
   // Checks if a name refers to a foreach kernel function
   bool isForEachKernel(llvm::StringRef name) const {
     return mForEachNameToSlot.count(name) != 0;
   }
 
-  const bcinfo::MetadataExtractor &getMetadata() const {
-    return *mMetadata;
-  }
+  const bcinfo::MetadataExtractor &getMetadata() const { return *mMetadata; }
 
   llvm::SmallVectorImpl<RSAllocationInfo> &getGlobalAllocs() {
     return mGlobalAllocs;