commit 579361346abc6696c805e3904a18178ebce4e4a3
author Stephen Hines <srhines@google.com> Tue Nov 25 17:54:59 2014 -0800
committer Stephen Hines <srhines@google.com> Wed Nov 26 17:58:51 2014 -0800
tree 49bbc360bcca9443dec72d1bfbe4b5da585f9539
parent b14e86905e0ffbee1d2b80abe87f6616e6831bae

Update libbcc for LLVM rebase to r222494.

Change-Id: Idebd60a98bbe62007086386e5497d1df7d901e3d

lib/Renderscript/RSInvokeHelperPass.cpp

diff --git a/lib/Renderscript/RSInvokeHelperPass.cpp b/lib/Renderscript/RSInvokeHelperPass.cpp
index 70503ee..a0c7c39 100644
--- a/lib/Renderscript/RSInvokeHelperPass.cpp
+++ b/lib/Renderscript/RSInvokeHelperPass.cpp
@@ -193,7 +193,7 @@
     return changed;
   }
 
-  virtual const char *getPassName() const {
+  virtual const char *getPassName() const override {
     return ".helper method expansion for large RS objects";
   }
 }; // end RSInvokeHelperPass class

lib/Renderscript/RSScript.cpp

diff --git a/lib/Renderscript/RSScript.cpp b/lib/Renderscript/RSScript.cpp
index 2dadc66..c93ca64 100644
--- a/lib/Renderscript/RSScript.cpp
+++ b/lib/Renderscript/RSScript.cpp
@@ -40,8 +40,7 @@
         &pScript.getSource().getModule(), &libclcore_source->getModule());
   }
 
-  if (!pScript.getSource().merge(*libclcore_source,
-                                 /* pPreserveSource */false)) {
+  if (!pScript.getSource().merge(*libclcore_source)) {
     ALOGE("Failed to link Renderscript library '%s'!", core_lib);
     delete libclcore_source;
     return false;