Skip to content

Commit

Permalink
Indexing source files when multiple toolchains are used.
Browse files Browse the repository at this point in the history 
This change solves the indexing of C/C++ files when multiple
toolchains are used in a single Makefile. This is for the use case in
which one (Linux) gcc compiler plus one or more custom embedded C
compilers (all producing ELF format binaries) are used.

To get proper indexing we need to know for each resource which
toolchain was used. The sub build configuration (via extension point
org.eclipse.cdt.core.buildConfigProvider) extends
StandardBuildConfiguration.java, and overrides method IToolChain
(List<String> commandgetToolChain). tcMap is filled with a map of
toolchains per resource. The primary toolchain keeps pointing to the
gcc toolchain.
  • Loading branch information
@ewaterlander @jonahgraham
ewaterlander authored and jonahgraham committed Nov 16, 2022
1 parent 171e7e3 commit 8c9faa1
Showing 1 changed file with 59 additions and 13 deletions.
72 changes: 59 additions & 13 deletions core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ public abstract class CBuildConfiguration extends PlatformObject implements ICBu

private static final List<String> DEFAULT_COMMAND = new ArrayList<>(0);

private final Map<IResource, IToolChain> tcMap = new HashMap<IResource, IToolChain>();

private final String name;
private final IBuildConfiguration config;
private final IToolChain toolChain;
Expand Down Expand Up @@ -310,6 +312,31 @@ public IToolChain getToolChain() throws CoreException {
return toolChain;
}

/**
* Get the toolchain based on the compiler found in the command line.
* Sub-classes can override this method to set their own method for
* getting the toolchain.
*
*/
protected IToolChain getToolChain(List<String> command) throws CoreException {
return getToolChain();
}

/**
* Get the toolchain that was used to compile this resource.
*
* @param resource
* @return
* @throws CoreException
*/
private IToolChain getToolChain(IResource resource) throws CoreException {
IToolChain tc = tcMap.get(resource);
if (tc == null)
return getToolChain();
else
return tc;
}

@Override
public IEnvironmentVariable getVariable(String name) {
IEnvironmentVariable[] vars = getVariables();
Expand Down Expand Up @@ -665,7 +692,8 @@ public IScannerInfo getScannerInformation(IResource resource) {
if (celement instanceof ITranslationUnit) {
try {
ITranslationUnit tu = (ITranslationUnit) celement;
info = getToolChain().getDefaultScannerInfo(getBuildConfiguration(), getBaseScannerInfo(resource),
IToolChain tc = getToolChain(resource);
info = tc.getDefaultScannerInfo(getBuildConfiguration(), getBaseScannerInfo(resource),
tu.getLanguage(), getBuildDirectoryURI());
synchronized (scannerInfoLock) {
scannerInfoCache.addScannerInfo(DEFAULT_COMMAND, info, resource);
Expand Down Expand Up @@ -736,7 +764,15 @@ public boolean processLine(String line) {
List<String> command = stripArgs(line);

// Make sure it's a compile command
String[] compileCommands = toolChain.getCompileCommands();
String[] compileCommands;
IToolChain tc;
try {
tc = getToolChain(command);
compileCommands = tc.getCompileCommands();
} catch (CoreException e) {
CCorePlugin.log(e);
return false;
}
boolean found = false;
loop: for (String arg : command) {
// TODO we should really ask the toolchain, not all args start with '-'
Expand Down Expand Up @@ -769,18 +805,19 @@ public boolean processLine(String line) {
}

try {
IResource[] resources = toolChain.getResourcesFromCommand(command, getBuildDirectoryURI());
IResource[] resources = tc.getResourcesFromCommand(command, getBuildDirectoryURI());
if (resources != null && resources.length > 0) {
List<String> commandStrings = toolChain.stripCommand(command, resources);
List<String> commandStrings = tc.stripCommand(command, resources);

boolean needScannerRefresh = false;

String needRefresh = toolChain.getProperty(NEED_REFRESH);
String needRefresh = tc.getProperty(NEED_REFRESH);
if ("true".equals(needRefresh)) { //$NON-NLS-1$
needScannerRefresh = true;
}

for (IResource resource : resources) {
tcMap.put(resource, tc);
loadScannerInfoCache();
boolean hasCommand = true;
synchronized (scannerInfoLock) {
Expand All @@ -801,8 +838,8 @@ public boolean processLine(String line) {
Path commandPath = findCommand(command.get(0));
if (commandPath != null) {
command.set(0, commandPath.toString());
IExtendedScannerInfo info = getToolChain().getScannerInfo(getBuildConfiguration(), command,
null, resource, getBuildDirectoryURI());
IExtendedScannerInfo info = tc.getScannerInfo(getBuildConfiguration(), command, null,
resource, getBuildDirectoryURI());
synchronized (scannerInfoLock) {
scannerInfoCache.addScannerInfo(commandStrings, info, resource);
infoChanged = true;
Expand Down Expand Up @@ -864,7 +901,15 @@ public boolean processLine(String line, List<Job> jobsArray) {
List<String> command = stripArgs(line);

// Make sure it's a compile command
String[] compileCommands = toolChain.getCompileCommands();
String[] compileCommands;
IToolChain tc;
try {
tc = getToolChain(command);
compileCommands = tc.getCompileCommands();
} catch (CoreException e) {
CCorePlugin.log(e);
return false;
}
boolean found = false;
loop: for (String arg : command) {
// TODO we should really ask the toolchain, not all args start with '-'
Expand Down Expand Up @@ -897,18 +942,19 @@ public boolean processLine(String line, List<Job> jobsArray) {
}

try {
IResource[] resources = toolChain.getResourcesFromCommand(command, getBuildDirectoryURI());
IResource[] resources = tc.getResourcesFromCommand(command, getBuildDirectoryURI());
if (resources != null && resources.length > 0) {
List<String> commandStrings = toolChain.stripCommand(command, resources);
List<String> commandStrings = tc.stripCommand(command, resources);

boolean needScannerRefresh = false;

String needRefresh = toolChain.getProperty(NEED_REFRESH);
String needRefresh = tc.getProperty(NEED_REFRESH);
if ("true".equals(needRefresh)) { //$NON-NLS-1$
needScannerRefresh = true;
}

for (IResource resource : resources) {
tcMap.put(resource, tc);
loadScannerInfoCache();
boolean hasCommand = true;
synchronized (scannerInfoLock) {
Expand All @@ -930,8 +976,8 @@ public boolean processLine(String line, List<Job> jobsArray) {
if (commandPath != null) {
command.set(0, commandPath.toString());
Job job = new ScannerInfoJob(
String.format(Messages.CBuildConfiguration_RunningScannerInfo, resource),
getToolChain(), command, resource, getBuildDirectoryURI(), commandStrings);
String.format(Messages.CBuildConfiguration_RunningScannerInfo, resource), tc,
command, resource, getBuildDirectoryURI(), commandStrings);
job.schedule();
jobsArray.add(job);
}
Expand Down

0 comments on commit 8c9faa1

Please sign in to comment.