Fix up expected IR output after rebase.

zlaski-semmle · zlaski-semmle · commit c906560eddf5 · 2019-07-13T12:57:25.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/Type.qll b/cpp/ql/src/semmle/code/cpp/Type.qll
@@ -322,6 +322,8 @@ class ErroneousType extends BuiltInType {
 
   ErroneousType() { builtintypes(underlyingElement(this),_,1,_,_,_) }
 
+  /** Canonical QL class corresponding to this element. */
+  override string getCanonicalQLClass() { result = "ErroneousType" }
 }
 
 /**
@@ -921,6 +923,9 @@ class ReferenceType extends DerivedType {
 
   ReferenceType() { derivedtypes(underlyingElement(this),_,2,_) or derivedtypes(underlyingElement(this),_,8,_) }
 
+  /** Canonical QL class corresponding to this element. */
+  override string getCanonicalQLClass() { result = "ReferenceType" }
+
   override int getPointerIndirectionLevel() {
     result = getBaseType().getPointerIndirectionLevel()
   }
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -190,6 +190,34 @@ bad_asts.cpp:
 #   27|                   Type = [LValueReferenceType]: const Point &
 #   27|                   ValueCategory = prvalue(load)
 #   28|     1: [ReturnStmt]: return ...
+#   30| [TopLevelFunction]: void Bad::errorExpr()
+#   30|   params: 
+#   30|   body: [Block]: { ... }
+#   31|     0: [DeclStmt]: declaration
+#   31|       0: [VariableDeclarationEntry]: definition of intref
+#   31|           Type = [LValueReferenceType]: int &
+#   31|         init: [Initializer]: initializer for intref
+#   31|           expr: [ErrorExpr]: <error expr>
+#   31|               Type = [ErroneousType]: error
+#   31|               ValueCategory = prvalue
+#   32|     1: [DeclStmt]: declaration
+#   32|       0: [VariableDeclarationEntry]: definition of x
+#   32|           Type = [IntType]: int
+#   32|         init: [Initializer]: initializer for x
+#   32|           expr: [ErrorExpr]: <error expr>
+#   32|               Type = [ErroneousType]: error
+#   32|               ValueCategory = prvalue
+#   33|     2: [ExprStmt]: ExprStmt
+#   33|       0: [AssignExpr]: ... = ...
+#   33|           Type = [IntType]: int
+#   33|           ValueCategory = lvalue
+#   33|         0: [VariableAccess]: x
+#   33|             Type = [IntType]: int
+#   33|             ValueCategory = lvalue
+#-----|         1: [ErrorExpr]: <error expr>
+#-----|             Type = [ErroneousType]: error
+#-----|             ValueCategory = prvalue(load)
+#   34|     3: [ReturnStmt]: return ...
 clang.cpp:
 #    5| [TopLevelFunction]: int* globalIntAddress()
 #    5|   params: 

Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,8 @@ class ErroneousType extends BuiltInType {`
`322`	`322`
`323`	`323`	`ErroneousType() { builtintypes(underlyingElement(this),_,1,_,_,_) }`
`324`	`324`
	`325`	`+ /** Canonical QL class corresponding to this element. */`
	`326`	`+ override string getCanonicalQLClass() { result = "ErroneousType" }`
`325`	`327`	`}`
`326`	`328`
`327`	`329`	`/**`
`@@ -921,6 +923,9 @@ class ReferenceType extends DerivedType {`
`921`	`923`
`922`	`924`	`ReferenceType() { derivedtypes(underlyingElement(this),_,2,_) or derivedtypes(underlyingElement(this),_,8,_) }`
`923`	`925`
	`926`	`+ /** Canonical QL class corresponding to this element. */`
	`927`	`+ override string getCanonicalQLClass() { result = "ReferenceType" }`
	`928`	`+`
`924`	`929`	`override int getPointerIndirectionLevel() {`
`925`	`930`	`result = getBaseType().getPointerIndirectionLevel()`
`926`	`931`	`}`