C++: Generate IR for assertions in release builds #21142

Original file line number	Diff line number	Diff line change
Expand Up		@@ -192,6 +192,15 @@ class Element extends ElementBase {
		*/
		predicate isAffectedByMacro() { affectedByMacro(this) }

	/**
	* INTERNAL: Do not use.
	*
	* Holds if this element is affected by the expansion of `mi`.
	*/
	predicate isAffectedByMacro(MacroInvocation mi) {
	affectedbymacroexpansion(underlyingElement(this), unresolveElement(mi))
	}

		private Element getEnclosingElementPref() {
		enclosingfunction(underlyingElement(this), unresolveElement(result)) or
		result.(Function) = stmtEnclosingElement(this) or
Expand Down

3 changes: 3 additions & 0 deletions cpp/ql/lib/semmle/code/cpp/Macro.qll

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -239,6 +239,9 @@ class MacroInvocation extends MacroAccess {
		macro_argument_unexpanded(underlyingElement(this), i, result)
		}

	/** Gets the number of arguments for this macro invocation. */
	int getNumberOfArguments() { result = count(int i \| exists(this.getUnexpandedArgument(i)) \| i) }

		/**
		* Gets the `i`th _expanded_ argument of this macro invocation, where the
		* first argument has `i = 0`. The result has been expanded for macros _and_
Expand Down

2 changes: 1 addition & 1 deletion cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,7 +23,7 @@ class Expr extends StmtParent, @expr {
		predicate hasChild(Expr e, int n) { e = this.getChild(n) }

		/** Gets the enclosing function of this expression, if any. */
	Function getEnclosingFunction() { result = exprEnclosingElement(this) }
	override Function getEnclosingFunction() { result = exprEnclosingElement(this) }

		/** Gets the nearest enclosing set of curly braces around this expression in the source, if any. */
		BlockStmt getEnclosingBlock() { result = this.getEnclosingStmt().getEnclosingBlock() }
Expand Down

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -104,7 +104,11 @@ newtype TInstructionTag =
		} or
		SizeofVlaDimensionTag(int index) {
		exists(VlaDeclStmt v \| exists(v.getTransitiveVlaDimensionStmt(index)))
	}
	} or
	AssertionVarAddressTag() or
	AssertionVarLoadTag() or
	AssertionOpTag() or
	AssertionBranchTag()

		class InstructionTag extends TInstructionTag {
		final string toString() { result = getInstructionTagId(this) }
Expand Down Expand Up		@@ -296,4 +300,12 @@ string getInstructionTagId(TInstructionTag tag) {
		tag = CoAwaitBranchTag() and result = "CoAwaitBranch"
		or
		tag = BoolToIntConversionTag() and result = "BoolToIntConversion"
	or
	tag = AssertionVarAddressTag() and result = "AssertionVarAddress"
	or
	tag = AssertionVarLoadTag() and result = "AssertionVarLoad"
	or
	tag = AssertionOpTag() and result = "AssertionOp"
	or
	tag = AssertionBranchTag() and result = "AssertionBranch"
		}

Navigation Menu