commit e8b9f0607d59e991d984302d790b8b16e3623cc3
author Pirama Arumuga Nainar <pirama@google.com> Fri Jun 12 14:25:28 2015 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Fri Jun 12 14:54:49 2015 -0700
tree 9c7862eb704a8aa971454c93a4444ae23f3f555a
parent 93dba9f99ef7783f709a5a8056a35d1b122a4f96

Get struct names only for non-literal structs

Bug 19545955

While marking loads as invariant, test that a struct parameter is
not a literal struct before comparing/testing its name.

Change-Id: I92fb234b42306859ecad87c83321f9a8fe1a210b

lib/Renderscript/RSInvariant.cpp

diff --git a/lib/Renderscript/RSInvariant.cpp b/lib/Renderscript/RSInvariant.cpp
index 1119a7a..94b5faf 100644
--- a/lib/Renderscript/RSInvariant.cpp
+++ b/lib/Renderscript/RSInvariant.cpp
@@ -78,10 +78,12 @@
       const llvm::Type *ArgType = Arg.getType();
       if (ArgType->isPointerTy()) {
         const llvm::Type *ArgPtrDomainType =  ArgType->getPointerElementType();
-        if (ArgPtrDomainType->isStructTy()) {
-          const llvm::StringRef StructName = ArgPtrDomainType->getStructName();
-          if (StructName.equals("struct.rs_kernel_context_t") || StructName.equals("RsExpandKernelDriverInfoPfx")) {
-            Changed |= markInvariantUserLoads(&Arg);
+        if (auto ArgPtrDomainStructType = llvm::dyn_cast<llvm::StructType>(ArgPtrDomainType)) {
+          if (ArgPtrDomainStructType->isLiteral()) {
+            const llvm::StringRef StructName = ArgPtrDomainStructType->getName();
+            if (StructName.equals("struct.rs_kernel_context_t") || StructName.equals("RsExpandKernelDriverInfoPfx")) {
+              Changed |= markInvariantUserLoads(&Arg);
+            }
           }
         }
       }