From a5e17433820e53b41b302428303fbb12ad0d5887 Mon Sep 17 00:00:00 2001
From: Andrzej Kotulski <akotulski@fb.com>
Date: Mon, 19 Oct 2015 07:54:30 -0700
Subject: [PATCH] Fix failing C++ frontend test

Reviewed By: jvillard

Differential Revision: D2555190

fb-gh-sync-id: af7bab2
---
 .../cpp/frontend/reference/nested_assignment.cpp.dot | 12 ++++++------
 .../frontend/reference/reference_type_e2e.cpp.dot    |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/nested_assignment.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/nested_assignment.cpp.dot
index dfb4399e5..d93fb7609 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/nested_assignment.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/nested_assignment.cpp.dot
@@ -7,11 +7,11 @@ digraph iCFG {
 	
 
 	 15 -> 14 ;
-14 [label="14:  DeclStmt \n   *&b:int =4 [line 28]\n  n$2=*&b:int  [line 28]\n  *&a:int =n$2 [line 28]\n  *&ref_from_val:int =&a [line 28]\n  REMOVE_TEMPS(n$2); [line 28]\n  NULLIFY(&b,false); [line 28]\n " shape="box"]
+14 [label="14:  DeclStmt \n   *&b:int =4 [line 28]\n  n$2=*&b:int  [line 28]\n  *&a:int =n$2 [line 28]\n  *&ref_from_val:int &=&a [line 28]\n  REMOVE_TEMPS(n$2); [line 28]\n  NULLIFY(&b,false); [line 28]\n " shape="box"]
 	
 
 	 14 -> 13 ;
-13 [label="13:  DeclStmt \n   n$0=*&ref_from_val:int & [line 29]\n  *&b:int =5 [line 29]\n  n$1=*&b:int  [line 29]\n  *n$0:int =n$1 [line 29]\n  *&ref_from_ref:int =n$0 [line 29]\n  REMOVE_TEMPS(n$0,n$1); [line 29]\n  NULLIFY(&b,false); [line 29]\n  NULLIFY(&ref_from_ref,false); [line 29]\n  NULLIFY(&ref_from_val,false); [line 29]\n  NULLIFY(&a,false); [line 29]\n  APPLY_ABSTRACTION; [line 29]\n " shape="box"]
+13 [label="13:  DeclStmt \n   n$0=*&ref_from_val:int & [line 29]\n  *&b:int =5 [line 29]\n  n$1=*&b:int  [line 29]\n  *n$0:int =n$1 [line 29]\n  *&ref_from_ref:int &=n$0 [line 29]\n  REMOVE_TEMPS(n$0,n$1); [line 29]\n  NULLIFY(&b,false); [line 29]\n  NULLIFY(&ref_from_ref,false); [line 29]\n  NULLIFY(&ref_from_val,false); [line 29]\n  NULLIFY(&a,false); [line 29]\n  APPLY_ABSTRACTION; [line 29]\n " shape="box"]
 	
 
 	 13 -> 12 ;
@@ -26,11 +26,11 @@ digraph iCFG {
 	
 
 	 10 -> 9 ;
-9 [label="9:  DeclStmt \n   *&a:int =4 [line 18]\n  *&ref_from_val:int =&a [line 18]\n " shape="box"]
+9 [label="9:  DeclStmt \n   *&a:int =4 [line 18]\n  *&ref_from_val:int &=&a [line 18]\n " shape="box"]
 	
 
 	 9 -> 8 ;
-8 [label="8:  DeclStmt \n   n$0=*&ref_from_val:int & [line 19]\n  *n$0:int =6 [line 19]\n  *&ref_from_ref:int =n$0 [line 19]\n  REMOVE_TEMPS(n$0); [line 19]\n  NULLIFY(&ref_from_ref,false); [line 19]\n  NULLIFY(&ref_from_val,false); [line 19]\n  NULLIFY(&a,false); [line 19]\n  APPLY_ABSTRACTION; [line 19]\n " shape="box"]
+8 [label="8:  DeclStmt \n   n$0=*&ref_from_val:int & [line 19]\n  *n$0:int =6 [line 19]\n  *&ref_from_ref:int &=n$0 [line 19]\n  REMOVE_TEMPS(n$0); [line 19]\n  NULLIFY(&ref_from_ref,false); [line 19]\n  NULLIFY(&ref_from_val,false); [line 19]\n  NULLIFY(&a,false); [line 19]\n  APPLY_ABSTRACTION; [line 19]\n " shape="box"]
 	
 
 	 8 -> 7 ;
@@ -45,11 +45,11 @@ digraph iCFG {
 	
 
 	 5 -> 4 ;
-4 [label="4:  DeclStmt \n   *&ref_from_val:int =&a [line 12]\n " shape="box"]
+4 [label="4:  DeclStmt \n   *&ref_from_val:int &=&a [line 12]\n " shape="box"]
 	
 
 	 4 -> 3 ;
-3 [label="3:  DeclStmt \n   n$0=*&ref_from_val:int & [line 13]\n  *&ref_from_ref:int =n$0 [line 13]\n  REMOVE_TEMPS(n$0); [line 13]\n  NULLIFY(&ref_from_ref,false); [line 13]\n  NULLIFY(&ref_from_val,false); [line 13]\n  NULLIFY(&a,false); [line 13]\n  APPLY_ABSTRACTION; [line 13]\n " shape="box"]
+3 [label="3:  DeclStmt \n   n$0=*&ref_from_val:int & [line 13]\n  *&ref_from_ref:int &=n$0 [line 13]\n  REMOVE_TEMPS(n$0); [line 13]\n  NULLIFY(&ref_from_ref,false); [line 13]\n  NULLIFY(&ref_from_val,false); [line 13]\n  NULLIFY(&a,false); [line 13]\n  APPLY_ABSTRACTION; [line 13]\n " shape="box"]
 	
 
 	 3 -> 2 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/reference_type_e2e.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/reference_type_e2e.cpp.dot
index 434117f15..e3bf6d50d 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/reference_type_e2e.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/reference_type_e2e.cpp.dot
@@ -7,11 +7,11 @@ digraph iCFG {
 	
 
 	 55 -> 54 ;
-54 [label="54:  DeclStmt \n   *&r1:int =&a [line 65]\n " shape="box"]
+54 [label="54:  DeclStmt \n   *&r1:int &=&a [line 65]\n " shape="box"]
 	
 
 	 54 -> 53 ;
-53 [label="53:  DeclStmt \n   n$2=*&r1:int & [line 66]\n  *&b:int =1 [line 66]\n  n$3=*&b:int  [line 66]\n  *n$2:int =n$3 [line 66]\n  *&r2:int =n$2 [line 66]\n  REMOVE_TEMPS(n$2,n$3); [line 66]\n  NULLIFY(&r1,false); [line 66]\n " shape="box"]
+53 [label="53:  DeclStmt \n   n$2=*&r1:int & [line 66]\n  *&b:int =1 [line 66]\n  n$3=*&b:int  [line 66]\n  *n$2:int =n$3 [line 66]\n  *&r2:int &=n$2 [line 66]\n  REMOVE_TEMPS(n$2,n$3); [line 66]\n  NULLIFY(&r1,false); [line 66]\n " shape="box"]
 	
 
 	 53 -> 52 ;
@@ -38,11 +38,11 @@ digraph iCFG {
 	
 
 	 47 -> 46 ;
-46 [label="46:  DeclStmt \n   *&r1:int =&a [line 56]\n " shape="box"]
+46 [label="46:  DeclStmt \n   *&r1:int &=&a [line 56]\n " shape="box"]
 	
 
 	 46 -> 45 ;
-45 [label="45:  DeclStmt \n   n$2=*&r1:int & [line 57]\n  *&b:int =1 [line 57]\n  n$3=*&b:int  [line 57]\n  *n$2:int =n$3 [line 57]\n  *&r2:int =n$2 [line 57]\n  REMOVE_TEMPS(n$2,n$3); [line 57]\n  NULLIFY(&b,false); [line 57]\n  NULLIFY(&r1,false); [line 57]\n " shape="box"]
+45 [label="45:  DeclStmt \n   n$2=*&r1:int & [line 57]\n  *&b:int =1 [line 57]\n  n$3=*&b:int  [line 57]\n  *n$2:int =n$3 [line 57]\n  *&r2:int &=n$2 [line 57]\n  REMOVE_TEMPS(n$2,n$3); [line 57]\n  NULLIFY(&b,false); [line 57]\n  NULLIFY(&r1,false); [line 57]\n " shape="box"]
 	
 
 	 45 -> 44 ;