diff --git a/facebook-clang-plugins b/facebook-clang-plugins
index 62448f69c..cf8bd8235 160000
--- a/facebook-clang-plugins
+++ b/facebook-clang-plugins
@@ -1 +1 @@
-Subproject commit 62448f69cf2de26a7a7599d3cec30c9446890674
+Subproject commit cf8bd8235837075d6b5699ec8ce4f985460526ee
diff --git a/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.c.dot b/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.c.dot
index 30b84f63a..3d856264e 100644
--- a/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.c.dot
@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-7 [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB$x:struct (anonymous_struct_at_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.c:12:1) * [line 32]\n  *n$3.a:int =1 [line 32]\n " shape="box"]
+7 [label="7:  BinaryOperatorStmt: Assign \n   n$3=*&#GB$x:struct anonymous_struct_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.c:12:1 * [line 32]\n  *n$3.a:int =1 [line 32]\n " shape="box"]
 	
 
 	 7 -> 6 ;
@@ -12,7 +12,7 @@ digraph iCFG {
 	
 
 	 5 -> 4 ;
-4 [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB$x:struct (anonymous_struct_at_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.c:12:1) * [line 36]\n  n$1=*n$0.b:int  [line 36]\n  *&#GB$y.g.w:int =n$1 [line 36]\n " shape="box"]
+4 [label="4:  BinaryOperatorStmt: Assign \n   n$0=*&#GB$x:struct anonymous_struct_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.c:12:1 * [line 36]\n  n$1=*n$0.b:int  [line 36]\n  *&#GB$y.g.w:int =n$1 [line 36]\n " shape="box"]
 	
 
 	 4 -> 3 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.cpp.dot b/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.cpp.dot
index 97e40ebe0..843aab37d 100644
--- a/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.cpp.dot
+++ b/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.cpp.dot
@@ -1,6 +1,6 @@
 /* @generated */
 digraph iCFG {
-9 [label="9:  BinaryOperatorStmt: Assign \n   n$3=*&#GB$x:class (anonymous_struct_at_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:12:1) * [line 32]\n  *n$3.a:int =1 [line 32]\n " shape="box"]
+9 [label="9:  BinaryOperatorStmt: Assign \n   n$3=*&#GB$x:class anonymous_struct_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:12:1 * [line 32]\n  *n$3.a:int =1 [line 32]\n " shape="box"]
 	
 
 	 9 -> 8 ;
@@ -12,7 +12,7 @@ digraph iCFG {
 	
 
 	 7 -> 6 ;
-6 [label="6:  BinaryOperatorStmt: Assign \n   n$0=*&#GB$x:class (anonymous_struct_at_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:12:1) * [line 36]\n  n$1=*n$0.b:int  [line 36]\n  *&#GB$y.g.w:int =n$1 [line 36]\n " shape="box"]
+6 [label="6:  BinaryOperatorStmt: Assign \n   n$0=*&#GB$x:class anonymous_struct_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:12:1 * [line 36]\n  n$1=*n$0.b:int  [line 36]\n  *&#GB$y.g.w:int =n$1 [line 36]\n " shape="box"]
 	
 
 	 6 -> 5 ;
@@ -27,10 +27,10 @@ digraph iCFG {
 	
 
 	 3 -> 9 ;
-2 [label="2: Exit (anonymous_union_at_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1)_ \n  " color=yellow style=filled]
+2 [label="2: Exit anonymous_union_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1_ \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start (anonymous_union_at_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1)_\nFormals:  this:class (anonymous_union_at_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1) *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
+1 [label="1: Start anonymous_union_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1_\nFormals:  this:class anonymous_union_infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;