commit fe8b885180ca2bcd0815887c0041b2ac2a5b5e65
author I-Jui (Ray) Sung <ijsung@google.com> Mon Apr 17 15:50:03 2017 -0700
committer I-Jui (Ray) Sung <ijsung@google.com> Mon Apr 17 16:29:18 2017 -0700
tree 5ab513a0d8132984a8502bbf50e2e037ab37b419
parent 151b107fc16b036fab4bff13268e5b4802cdb63f

Fix an assertion failure in slang RSSetObject generation

In clang::Stmt::CreateStructRSSetObject() an empty DeclarationNameInfo
was used to construct the source operand when constructing a call to
RSSetObject. This triggered an assertion failure on mismatching names
between FieldDecl and DeclarationNameInfo.

This fix passes a DeclarationNameInfo consistent with the FieldDecl's
name instead.

Bug: b/37363509
Bug: b/19545955
Test: slang tests, slang lit tests, RSTest and CTS on Angler all with
DISABLE_NDEBUG

Change-Id: I41dfba0f2a852fd48bcbdd4f8861da3d7aa8fd2a

slang_rs_object_ref_count.cpp

diff --git a/slang_rs_object_ref_count.cpp b/slang_rs_object_ref_count.cpp
index 6740a1e..300b720 100644
--- a/slang_rs_object_ref_count.cpp
+++ b/slang_rs_object_ref_count.cpp
@@ -955,7 +955,9 @@
                                   clang::SourceLocation(),
                                   FD,
                                   FoundDecl,
-                                  clang::DeclarationNameInfo(),
+                                  clang::DeclarationNameInfo(
+                                      FD->getDeclName(),
+                                      clang::SourceLocation()),
                                   nullptr,
                                   OrigType->getCanonicalTypeInternal(),
                                   clang::VK_RValue,