Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass path associations as special compiler flags #5301

Closed
wants to merge 2 commits into from
Closed

Pass path associations as special compiler flags #5301

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
823b31b
Pass path associations as special compiler flags
yvvan Jul 19, 2023
631db24
Address review comments in #5301 pull request
yvvan Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 33 additions & 16 deletions cpp/src/com/google/idea/blaze/cpp/BlazeCWorkspace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.errorprone.annotations.Keep;
import com.google.idea.blaze.base.ideinfo.*;
import com.google.idea.blaze.base.ideinfo.ArtifactLocation;
import com.google.idea.blaze.base.ideinfo.CIdeInfo;
import com.google.idea.blaze.base.ideinfo.Dependency;
import com.google.idea.blaze.base.ideinfo.TargetIdeInfo;
import com.google.idea.blaze.base.ideinfo.TargetKey;
import com.google.idea.blaze.base.model.BlazeProjectData;
import com.google.idea.blaze.base.model.primitives.ExecutionRootPath;
import com.google.idea.blaze.base.model.primitives.WorkspaceRoot;
Expand Down Expand Up @@ -68,7 +72,13 @@
import org.jetbrains.annotations.NotNull;

import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Stream;
Expand Down Expand Up @@ -167,16 +177,24 @@ private List<String> collectIncludes(String rootPath, TargetKey targetKey, Blaze
String stripPrefix = cIdeInfo.getStripIncludePrefix();
for (ArtifactLocation header : cIdeInfo.getHeaders()) {
String realPath = rootPath + "/" + header.getExecutionRootRelativePath();
String libPath = targetKey.getLabel().blazePackage().asPath().toString();
String pathUsedInSourceCode = header.getRelativePath();
tpasternak marked this conversation as resolved.
Show resolved Hide resolved
if (stripPrefix != null && !stripPrefix.isEmpty() && pathUsedInSourceCode.startsWith(stripPrefix)) {
pathUsedInSourceCode = pathUsedInSourceCode.substring(stripPrefix.length() +
(stripPrefix.endsWith("/") ? 0 : 1));
}
if (includePrefix != null && !includePrefix.isEmpty()) {
pathUsedInSourceCode = includePrefix + "/" + pathUsedInSourceCode;
}
if (pathUsedInSourceCode != null) {
if (libPath != null && !libPath.isEmpty() && pathUsedInSourceCode.startsWith(libPath)) {
pathUsedInSourceCode = pathUsedInSourceCode.substring(libPath.length() + 1);
}
if (stripPrefix != null && !stripPrefix.isEmpty() && pathUsedInSourceCode.startsWith(stripPrefix)) {
pathUsedInSourceCode = pathUsedInSourceCode.substring(stripPrefix.length() +
(stripPrefix.endsWith("/") ? 0 : 1));
System.out.println("updated path = " + pathUsedInSourceCode);
}
if (includePrefix != null && !includePrefix.isEmpty()) {
pathUsedInSourceCode = includePrefix + "/" + pathUsedInSourceCode;
System.out.println("updated path 2 = " + pathUsedInSourceCode);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove these print statements or change to logger calls

}

includes.add("-ibazel" + pathUsedInSourceCode + "=" + realPath);
includes.add("-ibazel" + pathUsedInSourceCode + "=" + realPath);
}
}

for (Dependency dep : targetIdeInfo.getDependencies()) {
Expand Down Expand Up @@ -219,14 +237,13 @@ private OCWorkspaceImpl.ModifiableModel calculateConfigurations(
continue;
}

@NotNull CIdeInfo cIdeInfo = targetIdeInfo.getcIdeInfo();
// defines and include directories are the same for all sources in a given target, so lets
// collect them once and reuse for each source file's options

UnfilteredCompilerOptions coptsExtractor =
UnfilteredCompilerOptions.builder()
.registerSingleOrSplitOption("-I")
.build(cIdeInfo.getLocalCopts());
.build(targetIdeInfo.getcIdeInfo().getLocalCopts());
ImmutableList<String> plainLocalCopts =
filterIncompatibleFlags(coptsExtractor.getUninterpretedOptions());
ImmutableList<ExecutionRootPath> localIncludes =
Expand All @@ -236,7 +253,7 @@ private OCWorkspaceImpl.ModifiableModel calculateConfigurations(

// transitiveDefines are sourced from a target's (and transitive deps) "defines" attribute
ImmutableList<String> transitiveDefineOptions =
cIdeInfo.getTransitiveDefines().stream()
targetIdeInfo.getcIdeInfo().getTransitiveDefines().stream()
.map(s -> "-D" + s)
.collect(toImmutableList());

Expand All @@ -250,7 +267,7 @@ private OCWorkspaceImpl.ModifiableModel calculateConfigurations(
ImmutableList<String> iOptionIncludeDirectories =
Stream.concat(
localIncludes.stream().flatMap(resolver),
cIdeInfo.getTransitiveIncludeDirectories().stream()
targetIdeInfo.getcIdeInfo().getTransitiveIncludeDirectories().stream()
.flatMap(resolver)
.filter(configResolveData::isValidHeaderRoot))
.map(file -> "-I" + file.getAbsolutePath())
Expand All @@ -259,7 +276,7 @@ private OCWorkspaceImpl.ModifiableModel calculateConfigurations(
// transitiveQuoteIncludeDirectories are sourced from
// CcSkylarkApiProvider.quote_include_directories
ImmutableList<String> iquoteOptionIncludeDirectories =
cIdeInfo.getTransitiveQuoteIncludeDirectories().stream()
targetIdeInfo.getcIdeInfo().getTransitiveQuoteIncludeDirectories().stream()
.flatMap(resolver)
.filter(configResolveData::isValidHeaderRoot)
.map(file -> "-iquote" + file.getAbsolutePath())
Expand All @@ -269,7 +286,7 @@ private OCWorkspaceImpl.ModifiableModel calculateConfigurations(
// Note: We would ideally use -isystem here, but it interacts badly with the switches
// that get built by ClangUtils::addIncludeDirectories (it uses -I for system libraries).
ImmutableList<String> isystemOptionIncludeDirectories =
cIdeInfo.getTransitiveSystemIncludeDirectories().stream()
targetIdeInfo.getcIdeInfo().getTransitiveSystemIncludeDirectories().stream()
.flatMap(resolver)
.filter(configResolveData::isValidHeaderRoot)
.map(file -> "-I" + file.getAbsolutePath())
Expand Down
Loading