Skip to content

Commit 9be379a

Browse files
committed
fix
1 parent 038b58d commit 9be379a

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

include/swift/Basic/FixedBitSet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class FixedBitSet {
7878
static size_t chunkIndex(ValueType i) {
7979
return size_t(i) / chunkSize;
8080
}
81-
static size_t chunkMask(ValueType i) {
81+
static ChunkType chunkMask(ValueType i) {
8282
return ChunkType(1) << (size_t(i) % chunkSize);
8383
}
8484

lib/ASTGen/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ add_pure_swift_host_library(swiftASTGen STATIC
4242

4343
DEPENDENCIES
4444
swiftAST
45-
swiftSyntaxUnified
4645
SWIFT_DEPENDENCIES
46+
swiftSyntaxUnified
4747
${ASTGen_Swift_dependencies}
4848
)
4949

@@ -52,11 +52,11 @@ add_pure_swift_host_library(swiftIDEUtilsBridging
5252

5353
DEPENDENCIES
5454
swiftAST
55+
SWIFT_DEPENDENCIES
5556
swiftASTGen
5657
swiftSyntaxUnified
5758
)
5859

59-
6060
set(c_include_paths
6161
# LLVM modules and headers.
6262
"${LLVM_MAIN_INCLUDE_DIR}"

lib/DriverTool/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ target_link_libraries(swiftDriverTool
3030
PUBLIC
3131
${driver_common_libs})
3232

33+
if (SWIFT_BUILD_SWIFT_SYNTAX)
34+
target_link_libraries(swiftDriverTool
35+
PRIVATE
36+
swiftASTGen
37+
)
38+
39+
add_dependencies(swiftDriverTool
40+
swiftASTGen
41+
)
42+
endif()
43+
3344
# If building as part of clang, make sure the headers are installed.
3445
if(NOT SWIFT_BUILT_STANDALONE)
3546
add_dependencies(swiftDriverTool clang-resource-headers)

lib/Frontend/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,15 @@ target_link_libraries(swiftFrontend PRIVATE
3737
swiftSerialization
3838
swiftSymbolGraphGen)
3939

40+
if (SWIFT_BUILD_SWIFT_SYNTAX)
41+
target_link_libraries(swiftFrontend
42+
PRIVATE
43+
swiftASTGen
44+
)
45+
46+
add_dependencies(swiftFrontend
47+
swiftASTGen
48+
)
49+
endif()
50+
4051
set_swift_llvm_is_available(swiftFrontend)

0 commit comments

Comments
 (0)