mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 07:35:24 +02:00
Code Issues Wiki Activity

Bug 529958 - Semantic highlighting of variable passed by non-const reference in a dependent call

Browse source 
Change-Id: I421bf98cbeff052c39716f1381e9f8930626318b
This commit is contained in:
Nathan Ridge 2018-01-17 23:35:14 -05:00
parent 15332e3287
commit df727d536f
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/SemanticHighlightingTest.java
View file

@ -662,7 +662,21 @@ public class SemanticHighlightingTest extends TestCase {
// void foo(unsigned i) { //$functionDeclaration,parameterVariable
// __builtin_assume_aligned(i, 4); //$problem,parameterVariable
// }
public void testMisuseOfKnownBuiltin_512932() throws Exception {
public void testMisuseOfKnownBuiltin_512932() throws Exception {
makeAssertions();
}
// struct S {}; //$class
//
// template <typename T> //$templateParameter
// void bar(T, S&); //$functionDeclaration,templateParameter,class
//
// template <typename T> //$templateParameter
// void foo(T t) { //$functionDeclaration,templateParameter,parameterVariable
// S state; //$class,localVariableDeclaration
// bar(t, state); //$function,parameterVariable,variablePassedByNonconstRef
// }
public void testVariablePassedByNonConstRef_529958() throws Exception {
makeAssertions();
}
}

27
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java
View file

@ -54,6 +54,7 @@ import org.eclipse.cdt.core.dom.ast.c.ICExternalBinding;
import org.eclipse.cdt.core.dom.ast.c.ICFunctionScope;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTClassVirtSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNameSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName;
@ -87,6 +88,8 @@ import org.eclipse.cdt.ui.text.ISemanticToken;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding;
import org.eclipse.cdt.internal.core.dom.parser.cpp.OverloadableOperator;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPFunctionSet;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.FunctionSetType;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.HeuristicResolver;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil;
@ -1694,7 +1697,9 @@ public class SemanticHighlightings {
IASTNode node = token.getNode();
// This highlighting only applies to function arguments.
boolean isFunctionArgument = (node instanceof IASTExpression) &&
// We also filter out C expressions at this stage, since references only exist in C++
// (and then we can cast to C++ AST node types without further checks below).
boolean isFunctionArgument = (node instanceof ICPPASTExpression) &&
(node.getParent() instanceof IASTFunctionCallExpression) &&
(node.getPropertyInParent() == IASTFunctionCallExpression.ARGUMENT);
if (!isFunctionArgument) {
@ -1711,10 +1716,26 @@ public class SemanticHighlightings {
// Resolve the type of the function being called.
// Note that, in the case of a call to a template function or a set of overloaded functions,
// the function name expression will be an id-expression, and
// CPPASTIdExpression.getExpressionType() will perform template instantiation and overload
// CPPASTIdExpression.getEvaluation() will perform template instantiation and overload
// resolution, and we'll get the instantiated function type.
// Note that we don't use CPPASTIdExpression.getExpressionType() because it typically turns
// a potentially-useful FunctionSetType into the useless CPPDeferredFunction.FUNCTION_TYPE.
IASTFunctionCallExpression functionCall = ((IASTFunctionCallExpression) node.getParent());
IType functionType = functionCall.getFunctionNameExpression().getExpressionType();
ICPPASTExpression functionName = (ICPPASTExpression) functionCall.getFunctionNameExpression();
IType functionType = functionName.getEvaluation().getType();
// If the call itself occurs in a dependent context, the function type may be a FunctionSetType.
// Make a best-effort attempt to work with it.
if (functionType instanceof FunctionSetType) {
CPPFunctionSet functionSet = ((FunctionSetType) functionType).getFunctionSet();
if (functionSet == null) {
return false;
}
ICPPFunction[] functions = functionSet.getBindings();
if (functions.length != 1) {
return false;
}
functionType = functions[0].getType();
}
functionType = SemanticUtil.getNestedType(functionType, TDEF | REF);
if (!(functionType instanceof ICPPFunctionType)) {
return false;