Skip to content

Commit fb0b995

Browse files
vladimirlazvladimirlaz
committed
Merge from 'main' to 'sycl-web' (#4)
 CONFLICT (content): Merge conflict in clang/lib/Parse/ParseDecl.cpp
2 parents 3246c4b + a5b627a commit fb0b995

File tree

13 files changed

+279
-105
lines changed

13 files changed

+279
-105
lines changed

‎clang/include/clang/Basic/LangOptions.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ LANGOPT(OpenCL , 1, 0, "OpenCL")
215215
LANGOPT(OpenCLVersion , 32, 0, "OpenCL C version")
216216
LANGOPT(OpenCLCPlusPlus , 1, 0, "C++ for OpenCL")
217217
LANGOPT(OpenCLCPlusPlusVersion , 32, 0, "C++ for OpenCL version")
218+
LANGOPT(OpenCLGenericAddressSpace, 1, 0, "OpenCL generic keyword")
219+
LANGOPT(OpenCLPipe , 1, 0, "OpenCL pipe keyword")
218220
LANGOPT(NativeHalfType , 1, 0, "Native half type support")
219221
LANGOPT(NativeHalfArgsAndReturns, 1, 0, "Native half args and returns")
220222
LANGOPT(HalfArgsAndReturns, 1, 0, "half args and returns")

‎clang/lib/Frontend/CompilerInvocation.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,6 +2400,9 @@ void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK,
24002400
Opts.ZVector = 0;
24012401
Opts.setDefaultFPContractMode(LangOptions::FPM_On);
24022402
Opts.OpenCLCPlusPlus = Opts.CPlusPlus;
2403+
Opts.OpenCLPipe = Opts.OpenCLCPlusPlus || Opts.OpenCLVersion == 200;
2404+
Opts.OpenCLGenericAddressSpace =
2405+
Opts.OpenCLCPlusPlus || Opts.OpenCLVersion == 200;
24032406

24042407
// Include default header file for OpenCL.
24052408
if (Opts.IncludeDefaultHeader) {

‎clang/lib/Parse/ParseDecl.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3897,8 +3897,8 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
38973897
case tok::kw_pipe:
38983898
if (!getLangOpts().OpenCL || (getLangOpts().OpenCLVersion < 200 &&
38993899
!getLangOpts().OpenCLCPlusPlus)) {
3900-
// OpenCL 2.0 defined this keyword. OpenCL 1.2 and earlier should
3901-
// support the "pipe" word as identifier.
3900+
// OpenCL 2.0 and later define this keyword. OpenCL 1.2 and earlier
3901+
// should support the "pipe" word as identifier.
39023902
Tok.getIdentifierInfo()->revertTokenIDToIdentifier();
39033903
goto DoneWithDeclSpec;
39043904
}
@@ -4018,8 +4018,7 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
40184018
case tok::kw___generic:
40194019
// generic address space is introduced only in OpenCL v2.0
40204020
// see OpenCL C Spec v2.0 s6.5.5
4021-
if (Actions.getLangOpts().OpenCLVersion < 200 &&
4022-
!Actions.getLangOpts().OpenCLCPlusPlus) {
4021+
if (!Actions.getLangOpts().OpenCLGenericAddressSpace) {
40234022
DiagID = diag::err_opencl_unknown_type_specifier;
40244023
PrevSpec = Tok.getIdentifierInfo()->getNameStart();
40254024
isInvalid = true;
@@ -5071,8 +5070,7 @@ bool Parser::isDeclarationSpecifier(bool DisambiguatingWithExpression) {
50715070
default: return false;
50725071

50735072
case tok::kw_pipe:
5074-
return (getLangOpts().OpenCL && getLangOpts().OpenCLVersion >= 200) ||
5075-
getLangOpts().OpenCLCPlusPlus;
5073+
return getLangOpts().OpenCLPipe;
50765074

50775075
case tok::identifier: // foo::bar
50785076
// Unfortunate hack to support "Class.factoryMethod" notation.
@@ -5600,8 +5598,7 @@ static bool isPtrOperatorToken(tok::TokenKind Kind, const LangOptions &Lang,
56005598
if (Kind == tok::star || Kind == tok::caret)
56015599
return true;
56025600

5603-
if ((Kind == tok::kw_pipe) &&
5604-
((Lang.OpenCL && Lang.OpenCLVersion >= 200) || Lang.OpenCLCPlusPlus))
5601+
if (Kind == tok::kw_pipe && Lang.OpenCLPipe)
56055602
return true;
56065603

56075604
if (!Lang.CPlusPlus)

‎clang/lib/Sema/SemaType.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2069,10 +2069,9 @@ static QualType deduceOpenCLPointeeAddrSpace(Sema &S, QualType PointeeType) {
20692069
!PointeeType->isSamplerT() &&
20702070
!PointeeType.hasAddressSpace())
20712071
PointeeType = S.getASTContext().getAddrSpaceQualType(
2072-
PointeeType,
2073-
S.getLangOpts().OpenCLCPlusPlus || S.getLangOpts().OpenCLVersion == 200
2074-
? LangAS::opencl_generic
2075-
: LangAS::opencl_private);
2072+
PointeeType, S.getLangOpts().OpenCLGenericAddressSpace
2073+
? LangAS::opencl_generic
2074+
: LangAS::opencl_private);
20762075
return PointeeType;
20772076
}
20782077

‎lldb/packages/Python/lldbsuite/test/dotest.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import os
3030
import platform
3131
import re
32+
import shutil
3233
import signal
3334
import subprocess
3435
import sys
@@ -272,21 +273,13 @@ def parseOptionsAndInitTestdirs():
272273
elif platform_system == 'Darwin':
273274
configuration.dsymutil = seven.get_command_output(
274275
'xcrun -find -toolchain default dsymutil')
275-
276-
277-
# The lldb-dotest script produced by the CMake build passes in a path to a
278-
# working FileCheck and yaml2obj binary. So does one specific Xcode
279-
# project target. However, when invoking dotest.py directly, a valid
280-
# --filecheck and --yaml2obj option needs to be given.
281-
if args.filecheck:
282-
configuration.filecheck = os.path.abspath(args.filecheck)
283-
284-
if args.yaml2obj:
285-
configuration.yaml2obj = os.path.abspath(args.yaml2obj)
276+
if args.llvm_tools_dir:
277+
configuration.filecheck = shutil.which("FileCheck", path=args.llvm_tools_dir)
278+
configuration.yaml2obj = shutil.which("yaml2obj", path=args.llvm_tools_dir)
286279

287280
if not configuration.get_filecheck_path():
288281
logging.warning('No valid FileCheck executable; some tests may fail...')
289-
logging.warning('(Double-check the --filecheck argument to dotest.py)')
282+
logging.warning('(Double-check the --llvm-tools-dir argument to dotest.py)')
290283

291284
if args.channels:
292285
lldbtest_config.channels = args.channels

‎lldb/packages/Python/lldbsuite/test/dotest_args.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ def create_parser():
5151
suggestions: do not lump the "-A arch1 -A arch2" together such that the -E option applies to only one of the architectures'''))
5252

5353
group.add_argument('--dsymutil', metavar='dsymutil', dest='dsymutil', help=textwrap.dedent('Specify which dsymutil to use.'))
54-
group.add_argument('--yaml2obj', metavar='yaml2obj', dest='yaml2obj', help=textwrap.dedent('Specify which yaml2obj binary to use.'))
55-
group.add_argument('--filecheck', metavar='filecheck', dest='filecheck', help=textwrap.dedent('Specify which FileCheck binary to use.'))
54+
group.add_argument('--llvm-tools-dir', metavar='dir', dest='llvm_tools_dir',
55+
help=textwrap.dedent('The location of llvm tools used for testing (yaml2obj, FileCheck, etc.).'))
5656

5757
# Test filtering options
5858
group = parser.add_argument_group('Test filtering options')

‎lldb/test/API/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ set(LLDB_TEST_COMMON_ARGS
4343
# Set the path to the default lldb test executable.
4444
set(LLDB_DEFAULT_TEST_EXECUTABLE "${LLVM_RUNTIME_OUTPUT_INTDIR}/lldb${CMAKE_EXECUTABLE_SUFFIX}")
4545

46-
# Set the paths to default llvm tools.
4746
set(LLDB_DEFAULT_TEST_DSYMUTIL "${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/dsymutil${CMAKE_EXECUTABLE_SUFFIX}")
48-
set(LLDB_DEFAULT_TEST_FILECHECK "${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/FileCheck${CMAKE_EXECUTABLE_SUFFIX}")
49-
set(LLDB_DEFAULT_TEST_YAML2OBJ "${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/yaml2obj${CMAKE_EXECUTABLE_SUFFIX}")
5047

5148
if (TARGET clang)
5249
set(LLDB_DEFAULT_TEST_COMPILER "${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/clang${CMAKE_EXECUTABLE_SUFFIX}")
@@ -57,8 +54,6 @@ endif()
5754
set(LLDB_TEST_EXECUTABLE "${LLDB_DEFAULT_TEST_EXECUTABLE}" CACHE PATH "lldb executable used for testing")
5855
set(LLDB_TEST_COMPILER "${LLDB_DEFAULT_TEST_COMPILER}" CACHE PATH "C Compiler to use for building LLDB test inferiors")
5956
set(LLDB_TEST_DSYMUTIL "${LLDB_DEFAULT_TEST_DSYMUTIL}" CACHE PATH "dsymutil used for generating dSYM bundles")
60-
set(LLDB_TEST_FILECHECK "${LLDB_DEFAULT_TEST_FILECHECK}" CACHE PATH "FileCheck used for testing purposes")
61-
set(LLDB_TEST_YAML2OBJ "${LLDB_DEFAULT_TEST_YAML2OBJ}" CACHE PATH "yaml2obj used for testing purposes")
6257

6358
if ("${LLDB_TEST_COMPILER}" STREQUAL "")
6459
message(FATAL_ERROR "LLDB test compiler not specified. Tests will not run.")
@@ -141,8 +136,6 @@ if(LLDB_BUILT_STANDALONE)
141136
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_EXECUTABLE "${LLDB_TEST_EXECUTABLE}")
142137
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_COMPILER "${LLDB_TEST_COMPILER}")
143138
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_DSYMUTIL "${LLDB_TEST_DSYMUTIL}")
144-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_FILECHECK "${LLDB_TEST_FILECHECK}")
145-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_YAML2OBJ "${LLDB_TEST_YAML2OBJ}")
146139
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_SERVER "${LLDB_TEST_SERVER}")
147140

148141
# Remaining ones must be paths to the provided LLVM build-tree.
@@ -170,8 +163,6 @@ string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_BUILD_DI
170163
string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_EXECUTABLE "${LLDB_TEST_EXECUTABLE}")
171164
string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_COMPILER "${LLDB_TEST_COMPILER}")
172165
string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_DSYMUTIL "${LLDB_TEST_DSYMUTIL}")
173-
string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_FILECHECK "${LLDB_TEST_FILECHECK}")
174-
string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_YAML2OBJ "${LLDB_TEST_YAML2OBJ}")
175166
string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_SERVER "${LLDB_TEST_SERVER}")
176167

177168
# Configure the API test suite.

‎lldb/test/API/lit.cfg.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,8 @@ def delete_module_cache(path):
208208
if is_configured('dsymutil'):
209209
dotest_cmd += ['--dsymutil', config.dsymutil]
210210

211-
if is_configured('filecheck'):
212-
dotest_cmd += ['--filecheck', config.filecheck]
213-
214-
if is_configured('yaml2obj'):
215-
dotest_cmd += ['--yaml2obj', config.yaml2obj]
211+
if is_configured('llvm_tools_dir'):
212+
dotest_cmd += ['--llvm-tools-dir', config.llvm_tools_dir]
216213

217214
if is_configured('server'):
218215
dotest_cmd += ['--server', config.server]

‎lldb/test/API/lit.site.cfg.py.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ config.lldb_executable = '@LLDB_TEST_EXECUTABLE@'
2929
config.test_arch = '@LLDB_TEST_ARCH@'
3030
config.test_compiler = '@LLDB_TEST_COMPILER@'
3131
config.dsymutil = '@LLDB_TEST_DSYMUTIL@'
32-
config.filecheck = '@LLDB_TEST_FILECHECK@'
33-
config.yaml2obj = '@LLDB_TEST_YAML2OBJ@'
3432
config.server = '@LLDB_TEST_SERVER@'
3533
# The API tests use their own module caches.
3634
config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-api")
@@ -57,9 +55,6 @@ try:
5755
config.lldb_executable = config.lldb_executable % lit_config.params
5856
config.lldb_libs_dir = config.lldb_libs_dir % lit_config.params
5957
config.test_compiler = config.test_compiler % lit_config.params
60-
config.dsymutil = config.dsymutil % lit_config.params
61-
config.filecheck = config.filecheck % lit_config.params
62-
config.yaml2obj = config.yaml2obj % lit_config.params
6358
config.server = config.server % lit_config.params
6459
config.lldb_framework_dir = config.lldb_framework_dir % lit_config.params
6560
config.dotest_args_str = config.dotest_args_str % lit_config.params

‎lldb/utils/lldb-dotest/CMakeLists.txt

Lines changed: 29 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,20 @@ llvm_canonicalize_cmake_booleans(
1010
LLDB_BUILD_INTEL_PT
1111
)
1212

13+
set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}")
14+
set(vars
15+
LLDB_DOTEST_ARGS
16+
LLDB_SOURCE_DIR
17+
LLDB_FRAMEWORK_DIR
18+
LLDB_TEST_BUILD_DIRECTORY
19+
LLDB_TEST_EXECUTABLE
20+
LLDB_TEST_COMPILER
21+
LLDB_TEST_DSYMUTIL
22+
LLDB_TEST_SERVER
23+
LLDB_LIBS_DIR
24+
LLVM_TOOLS_DIR
25+
)
26+
1327
# Generate lldb-dotest Python driver script for each build mode.
1428
if(LLDB_BUILT_STANDALONE)
1529
set(config_types ".")
@@ -19,44 +33,21 @@ if(LLDB_BUILT_STANDALONE)
1933
foreach(config_type ${config_types})
2034
# In paths to our build-tree, replace CMAKE_CFG_INTDIR with our actual configuration names.
2135
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} config_runtime_output_dir ${LLVM_RUNTIME_OUTPUT_INTDIR})
22-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_DOTEST_ARGS_CONFIGURED "${LLDB_DOTEST_ARGS}")
23-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_SOURCE_DIR_CONFIGURED "${LLDB_SOURCE_DIR}")
24-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_FRAMEWORK_DIR_CONFIGURED "${LLDB_FRAMEWORK_DIR}")
25-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_BUILD_DIRECTORY_CONFIGURED "${LLDB_TEST_BUILD_DIRECTORY}")
26-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_EXECUTABLE_CONFIGURED "${LLDB_TEST_EXECUTABLE}")
27-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_COMPILER_CONFIGURED "${LLDB_TEST_COMPILER}")
28-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_DSYMUTIL_CONFIGURED "${LLDB_TEST_DSYMUTIL}")
29-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_FILECHECK_CONFIGURED "${LLDB_TEST_FILECHECK}")
30-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_YAML2OBJ_CONFIGURED "${LLDB_TEST_YAML2OBJ}")
31-
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} LLDB_TEST_SERVER_CONFIGURED "${LLDB_TEST_SERVER}")
36+
foreach(var ${vars})
37+
string(REPLACE ${LLVM_RUNTIME_OUTPUT_INTDIR} ${config_runtime_output_dir} "${var}_CONFIGURED" "${${var}}")
38+
endforeach()
3239

3340
# Remaining ones must be paths to the provided LLVM build-tree.
3441
if(${config_type} IN_LIST LLVM_CONFIGURATION_TYPES)
3542
# Multi-configuration generator like Xcode (with a matching config).
36-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_DOTEST_ARGS_CONFIGURED "${LLDB_DOTEST_ARGS}")
37-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_SOURCE_DIR_CONFIGURED "${LLDB_SOURCE_DIR}")
38-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_FRAMEWORK_DIR_CONFIGURED "${LLDB_FRAMEWORK_DIR}")
39-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_TEST_BUILD_DIRECTORY_CONFIGURED "${LLDB_TEST_BUILD_DIRECTORY}")
40-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_TEST_EXECUTABLE_CONFIGURED "${LLDB_TEST_EXECUTABLE}")
41-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_TEST_COMPILER_CONFIGURED "${LLDB_TEST_COMPILER}")
42-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_TEST_DSYMUTIL_CONFIGURED "${LLDB_TEST_DSYMUTIL}")
43-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_TEST_FILECHECK_CONFIGURED "${LLDB_TEST_FILECHECK}")
44-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_TEST_YAML2OBJ_CONFIGURED "${LLDB_TEST_YAML2OBJ}")
45-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_TEST_SERVER_CONFIGURED "${LLDB_TEST_SERVER}")
46-
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} LLDB_LIBS_DIR_CONFIGURED "${LLDB_LIBS_DIR}")
43+
foreach(var ${vars})
44+
string(REPLACE ${CMAKE_CFG_INTDIR} ${config_type} "${var}_CONFIGURED" "${${var}}")
45+
endforeach()
4746
else()
4847
# Single-configuration generator like Ninja.
49-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_DOTEST_ARGS_CONFIGURED "${LLDB_DOTEST_ARGS}")
50-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_SOURCE_DIR_CONFIGURED "${LLDB_SOURCE_DIR}")
51-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_FRAMEWORK_DIR_CONFIGURED "${LLDB_FRAMEWORK_DIR}")
52-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_TEST_BUILD_DIRECTORY_CONFIGURED "${LLDB_TEST_BUILD_DIRECTORY}")
53-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_TEST_EXECUTABLE_CONFIGURED "${LLDB_TEST_EXECUTABLE}")
54-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_TEST_COMPILER_CONFIGURED "${LLDB_TEST_COMPILER}")
55-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_TEST_DSYMUTIL_CONFIGURED "${LLDB_TEST_DSYMUTIL}")
56-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_TEST_FILECHECK_CONFIGURED "${LLDB_TEST_FILECHECK}")
57-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_TEST_YAML2OBJ_CONFIGURED "${LLDB_TEST_YAML2OBJ}")
58-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_TEST_SERVER_CONFIGURED "${LLDB_TEST_SERVER}")
59-
string(REPLACE ${CMAKE_CFG_INTDIR} "." LLDB_LIBS_DIR_CONFIGURED "${LLDB_LIBS_DIR}")
48+
foreach(var ${vars})
49+
string(REPLACE ${CMAKE_CFG_INTDIR} "." "${var}_CONFIGURED" "${${var}}")
50+
endforeach()
6051
endif()
6152

6253
configure_file(
@@ -67,35 +58,19 @@ if(LLDB_BUILT_STANDALONE)
6758
elseif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
6859
foreach(LLVM_BUILD_MODE ${CMAKE_CONFIGURATION_TYPES})
6960
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_DOTEST_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
70-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_DOTEST_ARGS_CONFIGURED "${LLDB_DOTEST_ARGS}")
71-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_SOURCE_DIR_CONFIGURED "${LLDB_SOURCE_DIR}")
72-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_FRAMEWORK_DIR_CONFIGURED "${LLDB_FRAMEWORK_DIR}")
73-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_BUILD_DIRECTORY_CONFIGURED "${LLDB_TEST_BUILD_DIRECTORY}")
74-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_EXECUTABLE_CONFIGURED "${LLDB_TEST_EXECUTABLE}")
75-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_COMPILER_CONFIGURED "${LLDB_TEST_COMPILER}")
76-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_DSYMUTIL_CONFIGURED "${LLDB_TEST_DSYMUTIL}")
77-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_FILECHECK_CONFIGURED "${LLDB_TEST_FILECHECK}")
78-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_YAML2OBJ_CONFIGURED "${LLDB_TEST_YAML2OBJ}")
79-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TEST_SERVER_CONFIGURED "${LLDB_TEST_SERVER}")
80-
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_LIBS_DIR_CONFIGURED "${LLDB_LIBS_DIR}")
61+
foreach(var ${vars})
62+
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} "${var}_CONFIGURED" "${${var}}")
63+
endforeach()
8164

8265
configure_file(
8366
lldb-dotest.in
8467
${LLDB_DOTEST_DIR}/lldb-dotest
8568
)
8669
endforeach()
8770
else()
88-
set(LLDB_DOTEST_ARGS_CONFIGURED "${LLDB_DOTEST_ARGS}")
89-
set(LLDB_SOURCE_DIR_CONFIGURED "${LLDB_SOURCE_DIR}")
90-
set(LLDB_FRAMEWORK_DIR_CONFIGURED "${LLDB_FRAMEWORK_DIR}")
91-
set(LLDB_TEST_BUILD_DIRECTORY_CONFIGURED "${LLDB_TEST_BUILD_DIRECTORY}")
92-
set(LLDB_TEST_EXECUTABLE_CONFIGURED "${LLDB_TEST_EXECUTABLE}")
93-
set(LLDB_TEST_COMPILER_CONFIGURED "${LLDB_TEST_COMPILER}")
94-
set(LLDB_TEST_DSYMUTIL_CONFIGURED "${LLDB_TEST_DSYMUTIL}")
95-
set(LLDB_TEST_FILECHECK_CONFIGURED "${LLDB_TEST_FILECHECK}")
96-
set(LLDB_TEST_YAML2OBJ_CONFIGURED "${LLDB_TEST_YAML2OBJ}")
97-
set(LLDB_TEST_SERVER_CONFIGURED "${LLDB_TEST_SERVER}")
98-
set(LLDB_LIBS_DIR_CONFIGURED "${LLDB_LIBS_DIR}")
71+
foreach(var ${vars})
72+
set("${var}_CONFIGURED" "${${var}}")
73+
endforeach()
9974

10075
configure_file(
10176
lldb-dotest.in

‎lldb/utils/lldb-dotest/lldb-dotest.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ arch = '@LLDB_TEST_ARCH@'
88
executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@'
99
compiler = '@LLDB_TEST_COMPILER_CONFIGURED@'
1010
dsymutil = '@LLDB_TEST_DSYMUTIL_CONFIGURED@'
11-
filecheck = '@LLDB_TEST_FILECHECK_CONFIGURED@'
12-
yaml2obj = '@LLDB_TEST_YAML2OBJ_CONFIGURED@'
1311
server = '@LLDB_TEST_SERVER_CONFIGURED@'
1412
lldb_build_dir = '@LLDB_TEST_BUILD_DIRECTORY_CONFIGURED@'
1513
lldb_build_intel_pt = "@LLDB_BUILD_INTEL_PT@"
1614
lldb_framework_dir = "@LLDB_FRAMEWORK_DIR_CONFIGURED@"
1715
lldb_libs_dir = "@LLDB_LIBS_DIR_CONFIGURED@"
16+
llvm_tools_dir = "@LLVM_TOOLS_DIR_CONFIGURED@"
1817

1918
if __name__ == '__main__':
2019
wrapper_args = sys.argv[1:]
@@ -27,9 +26,8 @@ if __name__ == '__main__':
2726
cmd.extend(['--executable', executable])
2827
cmd.extend(['--compiler', compiler])
2928
cmd.extend(['--dsymutil', dsymutil])
30-
cmd.extend(['--yaml2obj', yaml2obj])
31-
cmd.extend(['--filecheck', filecheck])
3229
cmd.extend(['--lldb-libs-dir', lldb_libs_dir])
30+
cmd.extend(['--llvm-tools-dir', llvm_tools_dir])
3331
if server:
3432
cmd.extend(['--server', server])
3533
if lldb_framework_dir:

0 commit comments

Comments
 (0)