commit 0f6b1d319d0d3605042345c4a6973e9c4e9161d7
author Stephen Hines <srhines@google.com> Thu May 03 12:29:33 2012 -0700
committer Stephen Hines <srhines@google.com> Thu May 03 15:36:10 2012 -0700
tree 0304261a00d882505a21232faf58dc0bd1f2de90
parent addca8fc02254162220f6d512c59c84d65f44d2d

Revert "Introduce RSInfo and its reader/extractor/writer."

This reverts commit 255cbc8a78131fd828de0fac3ff70baeaa2f032f.

Conflicts:

	lib/ExecutionEngine/RSInfoExtractor.cpp

Change-Id: I533398c25cd7fde2a76418101d29374b6e1d2b27

lib/ExecutionEngine/RSScript.h

diff --git a/lib/ExecutionEngine/RSScript.h b/lib/ExecutionEngine/RSScript.h
index 50a3eb3..6e4cd9f 100644
--- a/lib/ExecutionEngine/RSScript.h
+++ b/lib/ExecutionEngine/RSScript.h
@@ -38,7 +38,6 @@
 }
 
 namespace bcc {
-  class RSInfo;
   class ScriptCompiled;
   class ScriptCached;
   class Source;
@@ -65,13 +64,18 @@
   public:
     class SourceDependency {
     private:
+      MCO_ResourceType mSourceType;
       std::string mSourceName;
       uint8_t mSHA1[20];
 
     public:
-      SourceDependency(const std::string &pSourceName,
+      SourceDependency(MCO_ResourceType pSourceType,
+                       const std::string &pSourceName,
                        const uint8_t *pSHA1);
 
+      inline MCO_ResourceType getSourceType() const
+      { return mSourceType; }
+
       inline const std::string &getSourceName() const
       { return mSourceName; }
 
@@ -109,8 +113,6 @@
 
     llvm::SmallVector<SourceDependency *, 4> mSourceDependencies;
 
-    const RSInfo *mInfo;
-
     // External Function List
     std::vector<char const *> mUserDefinedExternalSymbols;
 
@@ -132,19 +134,13 @@
     // Add dependency information for this script given the source named
     // pSourceName. pSHA1 is the SHA-1 checksum of the given source. Return
     // false on error.
-    bool addSourceDependency(const std::string &pSourceName,
+    bool addSourceDependency(MCO_ResourceType pSourceType,
+                             const std::string &pSourceName,
                              const uint8_t *pSHA1);
 
     const SourceDependencyListTy &getSourceDependencies() const
     { return mSourceDependencies; }
 
-    // Set the associated RSInfo of the script.
-    void setInfo(const RSInfo *pInfo)
-    { mInfo = pInfo; }
-
-    const RSInfo *getInfo() const
-    { return mInfo; }
-
     void markExternalSymbol(char const *name) {
       mUserDefinedExternalSymbols.push_back(name);
     }