Skip to content

Commit 5b29c8f

Browse files
committed
Handle error when resolving paths
1 parent deae668 commit 5b29c8f

File tree

2 files changed

+60
-2
lines changed

2 files changed

+60
-2
lines changed

.vscode/settings.json

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"files.associations": {
3+
"__bit_reference": "cpp",
4+
"__hash_table": "cpp",
5+
"__locale": "cpp",
6+
"__node_handle": "cpp",
7+
"__split_buffer": "cpp",
8+
"__threading_support": "cpp",
9+
"__verbose_abort": "cpp",
10+
"array": "cpp",
11+
"bitset": "cpp",
12+
"cctype": "cpp",
13+
"clocale": "cpp",
14+
"cmath": "cpp",
15+
"complex": "cpp",
16+
"cstdarg": "cpp",
17+
"cstddef": "cpp",
18+
"cstdint": "cpp",
19+
"cstdio": "cpp",
20+
"cstdlib": "cpp",
21+
"cstring": "cpp",
22+
"ctime": "cpp",
23+
"cwchar": "cpp",
24+
"cwctype": "cpp",
25+
"deque": "cpp",
26+
"execution": "cpp",
27+
"memory": "cpp",
28+
"fstream": "cpp",
29+
"initializer_list": "cpp",
30+
"iomanip": "cpp",
31+
"ios": "cpp",
32+
"iosfwd": "cpp",
33+
"iostream": "cpp",
34+
"istream": "cpp",
35+
"limits": "cpp",
36+
"locale": "cpp",
37+
"mutex": "cpp",
38+
"new": "cpp",
39+
"optional": "cpp",
40+
"ostream": "cpp",
41+
"print": "cpp",
42+
"queue": "cpp",
43+
"ratio": "cpp",
44+
"sstream": "cpp",
45+
"stack": "cpp",
46+
"stdexcept": "cpp",
47+
"streambuf": "cpp",
48+
"string": "cpp",
49+
"string_view": "cpp",
50+
"tuple": "cpp",
51+
"typeinfo": "cpp",
52+
"unordered_map": "cpp",
53+
"variant": "cpp",
54+
"vector": "cpp",
55+
"algorithm": "cpp"
56+
}
57+
}

bcc/compile_commands.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ compile_commands_builder::build(analysis::ActionGraphContainer const& action_gra
139139
// input file is required
140140
if (file.has_value()) {
141141
if (resolve_) {
142-
auto const resolved = std::filesystem::canonical(execution_root_ / file.value());
143-
if (starts_with(resolved.string(), workspace_path_.string())) {
142+
std::error_code ec;
143+
auto const resolved = std::filesystem::canonical(execution_root_ / file.value(), ec);
144+
if (!ec && starts_with(resolved.string(), workspace_path_.string())) {
144145
file = resolved.string();
145146
}
146147
}

0 commit comments

Comments
 (0)