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

[cling] Fix build with MacOSX15.0.sdk #15900

Merged
merged 2 commits into from
Jun 24, 2024
Merged

[cling] Fix build with MacOSX15.0.sdk #15900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78f8f29
std_darwin.modulemap: Remove headers for MacOSX15.0.sdk
hahnjo Jun 21, 2024
fbc9348
[Modules] textual headers in submodules never resolve their `use`s
ian-twilightcoder Oct 20, 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
56 changes: 1 addition & 55 deletions interpreter/cling/include/cling/std_darwin.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,10 +450,6 @@ module std_inttypes_h [system] {
export *
}
// <iso646.h> provided by compiler.
module std_limits_h [system] {
header "limits.h"
export *
}
module std_locale_h [system] {
header "locale.h"
export *
Expand All @@ -462,10 +458,7 @@ module std_math_h [system] {
header "math.h"
export *
}
module std_setjmp_h [system] {
header "setjmp.h"
export *
}
// <setjmp.h> provided by C library.
// <signal.h> provided by C library.
// FIXME: <stdalign.h> is missing.
// <stdarg.h> provided by compiler.
Expand Down Expand Up @@ -522,71 +515,26 @@ module std_wctype_h [system] {

// Experimental C++ standard library interfaces
module std_experimental [system] {
module deque {
header "experimental/deque"
export *
}
module forward_list {
header "experimental/forward_list"
export *
}
module iterator {
header "experimental/iterator"
export *
}
module list {
header "experimental/list"
export *
}
module map {
header "experimental/map"
export *
}
module memory_resource {
header "experimental/memory_resource"
export *
}
module propagate_const {
header "experimental/propagate_const"
export *
}
module regex {

header "experimental/regex"
export *
}
module simd {
header "experimental/simd"
export *
}
module set {
header "experimental/set"
export *
}
module string {
header "experimental/string"
export *
}
module type_traits {
header "experimental/type_traits"
export *
}
module unordered_map {
header "experimental/unordered_map"
export *
}
module unordered_set {
header "experimental/unordered_set"
export *
}
module utility {
header "experimental/utility"
export *
}
module vector {
header "experimental/vector"
export *
}
module __config {
private textual header "experimental/__config"
export *
Expand Down Expand Up @@ -1983,7 +1931,6 @@ module std_private_type_traits_nat [system
module std_private_type_traits_negation [system] { header "__type_traits/negation.h" }
module std_private_type_traits_noexcept_move_assign_container [system] { header "__type_traits/noexcept_move_assign_container.h" }
module std_private_type_traits_operation_traits [system] { header "__type_traits/operation_traits.h" }
module std_private_type_traits_predicate_traits [system] { header "__type_traits/predicate_traits.h" }
module std_private_type_traits_promote [system] { header "__type_traits/promote.h" }
module std_private_type_traits_rank [system] { header "__type_traits/rank.h" }
module std_private_type_traits_remove_all_extents [system] { header "__type_traits/remove_all_extents.h" }
Expand Down Expand Up @@ -2056,7 +2003,6 @@ module std_private_utility_swap [system] {
header "__utility/swap.h"
export std_private_type_traits_is_swappable
}
module std_private_utility_terminate_on_exception [system] { header "__utility/terminate_on_exception.h" }
module std_private_utility_to_underlying [system] { header "__utility/to_underlying.h" }
module std_private_utility_unreachable [system] { header "__utility/unreachable.h" }

Expand Down
13 changes: 7 additions & 6 deletions interpreter/llvm-project/clang/lib/Lex/ModuleMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,16 +1370,17 @@ bool ModuleMap::resolveExports(Module *Mod, bool Complain) {
}

bool ModuleMap::resolveUses(Module *Mod, bool Complain) {
auto Unresolved = std::move(Mod->UnresolvedDirectUses);
Mod->UnresolvedDirectUses.clear();
auto *Top = Mod->getTopLevelModule();
auto Unresolved = std::move(Top->UnresolvedDirectUses);
Top->UnresolvedDirectUses.clear();
for (auto &UDU : Unresolved) {
Module *DirectUse = resolveModuleId(UDU, Mod, Complain);
Module *DirectUse = resolveModuleId(UDU, Top, Complain);
if (DirectUse)
Mod->DirectUses.push_back(DirectUse);
Top->DirectUses.push_back(DirectUse);
else
Mod->UnresolvedDirectUses.push_back(UDU);
Top->UnresolvedDirectUses.push_back(UDU);
}
return !Mod->UnresolvedDirectUses.empty();
return !Top->UnresolvedDirectUses.empty();
}

bool ModuleMap::resolveConflicts(Module *Mod, bool Complain) {
Expand Down
2 changes: 1 addition & 1 deletion interpreter/llvm-project/llvm-project.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ROOT-llvm16-20240614-01
ROOT-llvm16-20240621-01
Loading