commit c10bc752d0e4e3bfc4c7e1077bdf3355a25d037f
author Jean-Luc Brouillet <jeanluc@google.com> Mon May 04 23:02:25 2015 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Tue May 19 13:36:17 2015 -0700
tree 4fe5b89c47e8481944c93ab2c9bf201227238f27
parent f71356cd0a20fb74cf2a61ce3544acae2e222142

Merge Slang with SlangRS, Backend with RSBackend.

Change-Id: I4721f92c10ec14a886923778595289f96d3a8de5
(cherry picked from commit 8024ed54c23c08534434da14d3be99c3efcc5754)

llvm-rs-cc.cpp

diff --git a/llvm-rs-cc.cpp b/llvm-rs-cc.cpp
index 4730710..6b879e0 100644
--- a/llvm-rs-cc.cpp
+++ b/llvm-rs-cc.cpp
@@ -35,7 +35,6 @@
 #include "slang.h"
 #include "slang_assert.h"
 #include "slang_diagnostic_buffer.h"
-#include "slang_rs.h"
 #include "slang_rs_reflect_utils.h"
 
 #include <list>
@@ -181,7 +180,7 @@
     IOFiles->push_back(std::make_pair(InputFile, OutputFile));
   }
 
-  std::unique_ptr<slang::SlangRS> Compiler(new slang::SlangRS());
+  std::unique_ptr<slang::Slang> Compiler(new slang::Slang());
   Compiler->init(Opts.mBitWidth, DiagEngine, DiagClient);
   int CompileFailed = !Compiler->compile(*IOFiles, *IOFiles32, DepFiles, Opts);
   // We suppress warnings (via reset) if we are doing a second compilation.