[lldb] Decouple importing the std C++ module from the way the program is compiled
Summary:
At the moment, when trying to import the `std` module in LLDB, we look at the imported modules used in the compiled program
and try to infer the Clang configuration we need from the DWARF module-import. That was the initial idea but turned out to
cause a few problems or inconveniences:
* It requires that users compile their programs with C++ modules. Given how experimental C++ modules are makes this feature inaccessible
for many users. Also it means that people can't just get the benefits of this feature for free when we activate it by default
(and we can't just close all the associated bug reports).
* Relying on DWARF's imported module tags (that are only emitted by default on macOS) means this can only be used when using DWARF (and with -glldb on Linux).
* We essentially hardcoded the C standard library paths on some platforms (Linux) or just couldn't support this feature on other platforms (macOS).
This patch drops the whole idea of looking at the imported module DWARF tags and instead just uses the support files of the compilation unit.
If we look at the support files and see file paths that indicate where the C standard library and libc++ are, we can just create the module
configuration this information. This fixes all the problems above which means we can enable all the tests now on Linux, macOS and with other debug information
than what we currently had. The only debug information specific code is now the iteration over external type module when -gmodules is used (as `std` and also the
`Darwin` module are their own external type module with their own files).
The meat of this patch is the CppModuleConfiguration which looks at the file paths from the compilation unit and then figures out the include paths
based on those paths. It's quite conservative in that it only enables modules if we find a single C library and single libc++ library. It's still missing some
test mode where we try to compile an expression before we actually activate the config for the user (which probably also needs some caching mechanism),
but for now it works and makes the feature usable.
Reviewers: aprantl, shafik, jdoerfert
Reviewed By: aprantl
Subscribers: mgorny, abidh, JDevlieghere, lldb-commits
Tags: #c_modules_in_lldb, #lldb
Differential Revision: https://reviews.llvm.org/D67760
llvm-svn: 372716
2019-09-24 18:08:18 +08:00
|
|
|
//===-- CppModuleConfigurationTest.cpp ---------------------------*- C++-*-===//
|
|
|
|
//
|
|
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "Plugins/ExpressionParser/Clang/CppModuleConfiguration.h"
|
|
|
|
#include "Plugins/ExpressionParser/Clang/ClangHost.h"
|
|
|
|
#include "lldb/Host/FileSystem.h"
|
|
|
|
#include "lldb/Host/HostInfo.h"
|
|
|
|
|
|
|
|
#include "gmock/gmock.h"
|
|
|
|
#include "gtest/gtest.h"
|
|
|
|
|
|
|
|
using namespace lldb_private;
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
struct CppModuleConfigurationTest : public testing::Test {
|
|
|
|
static void SetUpTestCase() {
|
|
|
|
// Getting the resource directory uses those subsystems, so we should
|
|
|
|
// initialize them.
|
|
|
|
FileSystem::Initialize();
|
|
|
|
HostInfo::Initialize();
|
|
|
|
}
|
|
|
|
static void TearDownTestCase() {
|
|
|
|
HostInfo::Terminate();
|
|
|
|
FileSystem::Terminate();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
/// Returns the Clang resource include directory.
|
|
|
|
static std::string ResourceInc() {
|
|
|
|
llvm::SmallString<256> resource_dir;
|
|
|
|
llvm::sys::path::append(resource_dir, GetClangResourceDir().GetPath(),
|
|
|
|
"include");
|
|
|
|
return resource_dir.str().str();
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Utility function turningn a list of paths into a FileSpecList.
|
|
|
|
static FileSpecList makeFiles(llvm::ArrayRef<std::string> paths) {
|
|
|
|
FileSpecList result;
|
|
|
|
for (const std::string &path : paths)
|
2019-09-24 20:13:35 +08:00
|
|
|
result.Append(FileSpec(path, FileSpec::Style::posix));
|
[lldb] Decouple importing the std C++ module from the way the program is compiled
Summary:
At the moment, when trying to import the `std` module in LLDB, we look at the imported modules used in the compiled program
and try to infer the Clang configuration we need from the DWARF module-import. That was the initial idea but turned out to
cause a few problems or inconveniences:
* It requires that users compile their programs with C++ modules. Given how experimental C++ modules are makes this feature inaccessible
for many users. Also it means that people can't just get the benefits of this feature for free when we activate it by default
(and we can't just close all the associated bug reports).
* Relying on DWARF's imported module tags (that are only emitted by default on macOS) means this can only be used when using DWARF (and with -glldb on Linux).
* We essentially hardcoded the C standard library paths on some platforms (Linux) or just couldn't support this feature on other platforms (macOS).
This patch drops the whole idea of looking at the imported module DWARF tags and instead just uses the support files of the compilation unit.
If we look at the support files and see file paths that indicate where the C standard library and libc++ are, we can just create the module
configuration this information. This fixes all the problems above which means we can enable all the tests now on Linux, macOS and with other debug information
than what we currently had. The only debug information specific code is now the iteration over external type module when -gmodules is used (as `std` and also the
`Darwin` module are their own external type module with their own files).
The meat of this patch is the CppModuleConfiguration which looks at the file paths from the compilation unit and then figures out the include paths
based on those paths. It's quite conservative in that it only enables modules if we find a single C library and single libc++ library. It's still missing some
test mode where we try to compile an expression before we actually activate the config for the user (which probably also needs some caching mechanism),
but for now it works and makes the feature usable.
Reviewers: aprantl, shafik, jdoerfert
Reviewed By: aprantl
Subscribers: mgorny, abidh, JDevlieghere, lldb-commits
Tags: #c_modules_in_lldb, #lldb
Differential Revision: https://reviews.llvm.org/D67760
llvm-svn: 372716
2019-09-24 18:08:18 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, Linux) {
|
|
|
|
// Test the average Linux configuration.
|
|
|
|
std::string libcpp = "/usr/include/c++/v1";
|
|
|
|
std::string usr = "/usr/include";
|
|
|
|
CppModuleConfiguration config(
|
|
|
|
makeFiles({usr + "/bits/types.h", libcpp + "/vector"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre("std"));
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(),
|
|
|
|
testing::ElementsAre(libcpp, ResourceInc(), usr));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, Sysroot) {
|
|
|
|
// Test that having a sysroot for the whole system works fine.
|
|
|
|
std::string libcpp = "/home/user/sysroot/usr/include/c++/v1";
|
|
|
|
std::string usr = "/home/user/sysroot/usr/include";
|
|
|
|
CppModuleConfiguration config(
|
|
|
|
makeFiles({usr + "/bits/types.h", libcpp + "/vector"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre("std"));
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(),
|
|
|
|
testing::ElementsAre(libcpp, ResourceInc(), usr));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, LinuxLocalLibCpp) {
|
|
|
|
// Test that a locally build libc++ is detected.
|
|
|
|
std::string libcpp = "/home/user/llvm-build/include/c++/v1";
|
|
|
|
std::string usr = "/usr/include";
|
|
|
|
CppModuleConfiguration config(
|
|
|
|
makeFiles({usr + "/bits/types.h", libcpp + "/vector"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre("std"));
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(),
|
|
|
|
testing::ElementsAre(libcpp, ResourceInc(), usr));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, UnrelatedLibrary) {
|
|
|
|
// Test that having an unrelated library in /usr/include doesn't break.
|
|
|
|
std::string libcpp = "/home/user/llvm-build/include/c++/v1";
|
|
|
|
std::string usr = "/usr/include";
|
|
|
|
CppModuleConfiguration config(makeFiles(
|
|
|
|
{usr + "/bits/types.h", libcpp + "/vector", usr + "/boost/vector"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre("std"));
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(),
|
|
|
|
testing::ElementsAre(libcpp, ResourceInc(), usr));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, Xcode) {
|
|
|
|
// Test detection of libc++ coming from Xcode with generic platform names.
|
|
|
|
std::string p = "/Applications/Xcode.app/Contents/Developer/";
|
|
|
|
std::string libcpp = p + "Toolchains/B.xctoolchain/usr/include/c++/v1";
|
|
|
|
std::string usr =
|
|
|
|
p + "Platforms/A.platform/Developer/SDKs/OSVers.sdk/usr/include";
|
|
|
|
CppModuleConfiguration config(
|
|
|
|
makeFiles({libcpp + "/unordered_map", usr + "/stdio.h"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre("std"));
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(),
|
|
|
|
testing::ElementsAre(libcpp, ResourceInc(), usr));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, LibCppV2) {
|
|
|
|
// Test that a "v2" of libc++ is still correctly detected.
|
|
|
|
CppModuleConfiguration config(
|
|
|
|
makeFiles({"/usr/include/bits/types.h", "/usr/include/c++/v2/vector"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre("std"));
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(),
|
|
|
|
testing::ElementsAre("/usr/include/c++/v2", ResourceInc(),
|
|
|
|
"/usr/include"));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, UnknownLibCppFile) {
|
|
|
|
// Test that having some unknown file in the libc++ path doesn't break
|
|
|
|
// anything.
|
|
|
|
CppModuleConfiguration config(makeFiles(
|
|
|
|
{"/usr/include/bits/types.h", "/usr/include/c++/v1/non_existing_file"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre("std"));
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(),
|
|
|
|
testing::ElementsAre("/usr/include/c++/v1", ResourceInc(),
|
|
|
|
"/usr/include"));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, MissingUsrInclude) {
|
|
|
|
// Test that we don't load 'std' if we can't find the C standard library.
|
|
|
|
CppModuleConfiguration config(makeFiles({"/usr/include/c++/v1/vector"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre());
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(), testing::ElementsAre());
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, MissingLibCpp) {
|
|
|
|
// Test that we don't load 'std' if we don't have a libc++.
|
|
|
|
CppModuleConfiguration config(makeFiles({"/usr/include/bits/types.h"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre());
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(), testing::ElementsAre());
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, IgnoreLibStdCpp) {
|
|
|
|
// Test that we don't do anything bad when we encounter libstdc++ paths.
|
|
|
|
CppModuleConfiguration config(makeFiles(
|
|
|
|
{"/usr/include/bits/types.h", "/usr/include/c++/8.0.1/vector"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre());
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(), testing::ElementsAre());
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, AmbiguousCLib) {
|
|
|
|
// Test that we don't do anything when we are not sure where the
|
|
|
|
// right C standard library is.
|
|
|
|
CppModuleConfiguration config(
|
|
|
|
makeFiles({"/usr/include/bits/types.h", "/usr/include/c++/v1/vector",
|
|
|
|
"/sysroot/usr/include/bits/types.h"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre());
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(), testing::ElementsAre());
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST_F(CppModuleConfigurationTest, AmbiguousLibCpp) {
|
|
|
|
// Test that we don't do anything when we are not sure where the
|
|
|
|
// right libc++ is.
|
|
|
|
CppModuleConfiguration config(
|
|
|
|
makeFiles({"/usr/include/bits/types.h", "/usr/include/c++/v1/vector",
|
|
|
|
"/usr/include/c++/v2/vector"}));
|
|
|
|
EXPECT_THAT(config.GetImportedModules(), testing::ElementsAre());
|
|
|
|
EXPECT_THAT(config.GetIncludeDirs(), testing::ElementsAre());
|
|
|
|
}
|