diff options
| author |  rosica <rosica@google.com> | 2018-05-02 07:07:47 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-02 07:09:40 -0700 |
| commit | ac656a95906f1799f7d894b7ad57ce7844622938 (patch) | |
| tree | 582733bfcb908e239f8bfee216a492506b90b85a /src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | |
| parent | 86a9b6f0a6c5e9ff761634c0d33b640756ffa62d (diff) | |
Fix CppConfiguration#isLLVMOptimizedFdo() method to work with --fdo_profile
This method is used to determine whether a zipper executable should be loaded. Currently it only checks whether the file specified by --fdo_optimize is a zip file. As we cannot check whether --fdo_profile points to a zip file in this phase, we load it unconditionally in the case of --fdo_profile optimization.
PiperOrigin-RevId: 195087124
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 19adeb661b..e4aea90680 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -892,12 +892,12 @@ public final class CppConfiguration extends BuildConfiguration.Fragment { */ // TODO(b/64384912): Remove in favor of overload with isLLVMCompiler. @Deprecated - public boolean isLLVMOptimizedFdo() { - return cppOptions.getFdoOptimize() != null - && (CppFileTypes.LLVM_PROFILE.matches(cppOptions.getFdoOptimize()) - || CppFileTypes.LLVM_PROFILE_RAW.matches(cppOptions.getFdoOptimize()) - || (isLLVMCompiler() - && cppOptions.getFdoOptimize().endsWith(".zip"))); + public boolean shouldIncludeZipperInToolchain() { + return (cppOptions.getFdoOptimize() != null + && (CppFileTypes.LLVM_PROFILE.matches(cppOptions.getFdoOptimize()) + || CppFileTypes.LLVM_PROFILE_RAW.matches(cppOptions.getFdoOptimize()) + || (isLLVMCompiler() && cppOptions.getFdoOptimize().endsWith(".zip")))) + || (cppOptions.getFdoProfileLabel() != null); } /** Returns true if LIPO optimization is implied by the flags of this build. */ |