diff --git a/infer/tests/codetoanalyze/cpp/frontend/templates/function.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/templates/function.cpp.dot
index 464306124..3474f972d 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/templates/function.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/templates/function.cpp.dot
@@ -1,61 +1,61 @@
 digraph iCFG {
-49 [label="49:  Return Stmt \n   n$0=_fun_createAndGetVal<struct X3>() [line 70]\n  n$1=_fun_createAndGetVal<struct X1>() [line 70]\n  *&return:int =(n$0 / n$1) [line 70]\n  REMOVE_TEMPS(n$0,n$1); [line 70]\n  APPLY_ABSTRACTION; [line 70]\n " shape="box"]
+49 [label="49:  Return Stmt \n   n$0=_fun_createAndGetVal<struct X3>() [line 72]\n  n$1=_fun_createAndGetVal<struct X1>() [line 72]\n  *&return:int =(n$0 / n$1) [line 72]\n  REMOVE_TEMPS(n$0,n$1); [line 72]\n  APPLY_ABSTRACTION; [line 72]\n " shape="box"]
 	
 
 	 49 -> 48 ;
 48 [label="48: Exit div1_create_and_get_val \n  " color=yellow style=filled]
 	
 
-47 [label="47: Start div1_create_and_get_val\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 69]\n " color=yellow style=filled]
+47 [label="47: Start div1_create_and_get_val\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 71]\n " color=yellow style=filled]
 	
 
 	 47 -> 49 ;
-46 [label="46:  Return Stmt \n   n$0=_fun_createAndGetVal<struct X1>() [line 66]\n  n$1=_fun_createAndGetVal<struct X3>() [line 66]\n  *&return:int =(n$0 / n$1) [line 66]\n  REMOVE_TEMPS(n$0,n$1); [line 66]\n  APPLY_ABSTRACTION; [line 66]\n " shape="box"]
+46 [label="46:  Return Stmt \n   n$0=_fun_createAndGetVal<struct X1>() [line 68]\n  n$1=_fun_createAndGetVal<struct X3>() [line 68]\n  *&return:int =(n$0 / n$1) [line 68]\n  REMOVE_TEMPS(n$0,n$1); [line 68]\n  APPLY_ABSTRACTION; [line 68]\n " shape="box"]
 	
 
 	 46 -> 45 ;
 45 [label="45: Exit div0_create_and_get_val \n  " color=yellow style=filled]
 	
 
-44 [label="44: Start div0_create_and_get_val\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
+44 [label="44: Start div0_create_and_get_val\nFormals: \nLocals:  \n   DECLARE_LOCALS(&return); [line 67]\n " color=yellow style=filled]
 	
 
 	 44 -> 46 ;
-43 [label="43:  Call _fun_X1_X1 \n   _fun_X1_X1(&x1:class X1 *) [line 60]\n " shape="box"]
+43 [label="43:  Call _fun_X1_X1 \n   _fun_X1_X1(&x1:class X1 *) [line 62]\n " shape="box"]
 	
 
 	 43 -> 42 ;
-42 [label="42:  Call _fun_X3_X3 \n   _fun_X3_X3(&x3:class X3 *) [line 61]\n " shape="box"]
+42 [label="42:  Call _fun_X3_X3 \n   _fun_X3_X3(&x3:class X3 *) [line 63]\n " shape="box"]
 	
 
 	 42 -> 41 ;
-41 [label="41:  Return Stmt \n   n$0=_fun_getVal<struct X3>(&x3:class X3 &) [line 62]\n  n$1=_fun_getVal<struct X1>(&x1:class X1 &) [line 62]\n  *&return:int =(n$0 / n$1) [line 62]\n  REMOVE_TEMPS(n$0,n$1); [line 62]\n  NULLIFY(&x1,false); [line 62]\n  NULLIFY(&x3,false); [line 62]\n  APPLY_ABSTRACTION; [line 62]\n " shape="box"]
+41 [label="41:  Return Stmt \n   n$0=_fun_getVal<struct X3>(&x3:class X3 &) [line 64]\n  n$1=_fun_getVal<struct X1>(&x1:class X1 &) [line 64]\n  *&return:int =(n$0 / n$1) [line 64]\n  REMOVE_TEMPS(n$0,n$1); [line 64]\n  NULLIFY(&x1,false); [line 64]\n  NULLIFY(&x3,false); [line 64]\n  APPLY_ABSTRACTION; [line 64]\n " shape="box"]
 	
 
 	 41 -> 40 ;
 40 [label="40: Exit div1_get_val \n  " color=yellow style=filled]
 	
 
-39 [label="39: Start div1_get_val\nFormals: \nLocals:  x3:class X3  x1:class X1  \n   DECLARE_LOCALS(&return,&x3,&x1); [line 59]\n " color=yellow style=filled]
+39 [label="39: Start div1_get_val\nFormals: \nLocals:  x3:class X3  x1:class X1  \n   DECLARE_LOCALS(&return,&x3,&x1); [line 61]\n " color=yellow style=filled]
 	
 
 	 39 -> 43 ;
-38 [label="38:  Call _fun_X1_X1 \n   _fun_X1_X1(&x1:class X1 *) [line 54]\n " shape="box"]
+38 [label="38:  Call _fun_X1_X1 \n   _fun_X1_X1(&x1:class X1 *) [line 56]\n " shape="box"]
 	
 
 	 38 -> 37 ;
-37 [label="37:  Call _fun_X3_X3 \n   _fun_X3_X3(&x3:class X3 *) [line 55]\n " shape="box"]
+37 [label="37:  Call _fun_X3_X3 \n   _fun_X3_X3(&x3:class X3 *) [line 57]\n " shape="box"]
 	
 
 	 37 -> 36 ;
-36 [label="36:  Return Stmt \n   n$0=_fun_getVal<struct X1>(&x1:class X1 &) [line 56]\n  n$1=_fun_getVal<struct X3>(&x3:class X3 &) [line 56]\n  *&return:int =(n$0 / n$1) [line 56]\n  REMOVE_TEMPS(n$0,n$1); [line 56]\n  NULLIFY(&x1,false); [line 56]\n  NULLIFY(&x3,false); [line 56]\n  APPLY_ABSTRACTION; [line 56]\n " shape="box"]
+36 [label="36:  Return Stmt \n   n$0=_fun_getVal<struct X1>(&x1:class X1 &) [line 58]\n  n$1=_fun_getVal<struct X3>(&x3:class X3 &) [line 58]\n  *&return:int =(n$0 / n$1) [line 58]\n  REMOVE_TEMPS(n$0,n$1); [line 58]\n  NULLIFY(&x1,false); [line 58]\n  NULLIFY(&x3,false); [line 58]\n  APPLY_ABSTRACTION; [line 58]\n " shape="box"]
 	
 
 	 36 -> 35 ;
 35 [label="35: Exit div0_get_val \n  " color=yellow style=filled]
 	
 
-34 [label="34: Start div0_get_val\nFormals: \nLocals:  x3:class X3  x1:class X1  \n   DECLARE_LOCALS(&return,&x3,&x1); [line 53]\n " color=yellow style=filled]
+34 [label="34: Start div0_get_val\nFormals: \nLocals:  x3:class X3  x1:class X1  \n   DECLARE_LOCALS(&return,&x3,&x1); [line 55]\n " color=yellow style=filled]
 	
 
 	 34 -> 38 ;