Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ if(NOT EXISTS "${CLANG_MAIN_INCLUDE_DIR}/clang/AST/Decl.h")
endif()

# This could be computed using ${CMAKE_CFG_INTDIR} if we want to link Swift
# against a mathing LLVM build configuration. However, we usually want to be
# against a matching LLVM build configuration. However, we usually want to be
# flexible and allow linking a debug Swift against optimized LLVM.
set(LLVM_RUNTIME_OUTPUT_INTDIR "${LLVM_BINARY_DIR}")
set(LLVM_LIBRARY_OUTPUT_INTDIR "${LLVM_LIBRARY_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion docs/IndexInvalidation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ user:
This rule does not imply that indices should be cheap to convert to actual
integers. The offsets for consecutive elements could be non-consecutive
(e.g., in a hash table with open addressing), or consist of multiple
offsets so that the conversion to an integer is non-trival (e.g., in a
offsets so that the conversion to an integer is non-trivial (e.g., in a
tree).

Note that this rule, like all other rules, is an "as if" rule. As long as
Expand Down