Index: include/lldb/Expression/ClangExpressionParser.h =================================================================== --- include/lldb/Expression/ClangExpressionParser.h +++ include/lldb/Expression/ClangExpressionParser.h @@ -52,6 +52,7 @@ //------------------------------------------------------------------ ClangExpressionParser (ExecutionContextScope *exe_scope, ClangExpression &expr, + Args &expr_parser_compiler_args, bool generate_debug_info); //------------------------------------------------------------------ Index: include/lldb/Target/Target.h =================================================================== --- include/lldb/Target/Target.h +++ include/lldb/Target/Target.h @@ -113,6 +113,12 @@ void SetRunArguments (const Args &args); + + bool + GetExprParserCompilerArguments (Args &args) const; + + void + SetExprParserCompilerArguments (const Args &args); size_t GetEnvironmentAsArgs (Args &env) const; Index: source/Expression/ClangExpressionParser.cpp =================================================================== --- source/Expression/ClangExpressionParser.cpp +++ source/Expression/ClangExpressionParser.cpp @@ -98,6 +98,7 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope, ClangExpression &expr, + Args &expr_parser_compiler_args, bool generate_debug_info) : m_expr (expr), m_compiler (), @@ -152,6 +153,11 @@ // 3. Set options. + clang::CompilerInvocation::CreateFromArgs(m_compiler->getInvocation(), + expr_parser_compiler_args.GetConstArgumentVector(), + expr_parser_compiler_args.GetConstArgumentVector() + expr_parser_compiler_args.GetArgumentCount(), + m_compiler->getDiagnostics()); + lldb::LanguageType language = expr.Language(); switch (language) Index: source/Expression/ClangFunction.cpp =================================================================== --- source/Expression/ClangFunction.cpp +++ source/Expression/ClangFunction.cpp @@ -238,7 +238,9 @@ if (jit_process_sp) { const bool generate_debug_info = true; - m_parser.reset(new ClangExpressionParser(jit_process_sp.get(), *this, generate_debug_info)); + Args expr_parser_compiler_args; + jit_process_sp->GetTarget().GetExprParserCompilerArguments (expr_parser_compiler_args); + m_parser.reset(new ClangExpressionParser(jit_process_sp.get(), *this, expr_parser_compiler_args, generate_debug_info)); num_errors = m_parser->Parse (errors); } Index: source/Expression/ClangUserExpression.cpp =================================================================== --- source/Expression/ClangUserExpression.cpp +++ source/Expression/ClangUserExpression.cpp @@ -527,7 +527,9 @@ if (!exe_scope) exe_scope = exe_ctx.GetTargetPtr(); - ClangExpressionParser parser(exe_scope, *this, generate_debug_info); + Args expr_parser_compiler_args; + target->GetExprParserCompilerArguments (expr_parser_compiler_args); + ClangExpressionParser parser(exe_scope, *this, expr_parser_compiler_args, generate_debug_info); unsigned num_errors = parser.Parse (error_stream); Index: source/Expression/ClangUtilityFunction.cpp =================================================================== --- source/Expression/ClangUtilityFunction.cpp +++ source/Expression/ClangUtilityFunction.cpp @@ -122,7 +122,9 @@ } const bool generate_debug_info = true; - ClangExpressionParser parser(exe_ctx.GetBestExecutionContextScope(), *this, generate_debug_info); + Args expr_parser_compiler_args; + target->GetExprParserCompilerArguments (expr_parser_compiler_args); + ClangExpressionParser parser(exe_ctx.GetBestExecutionContextScope(), *this, expr_parser_compiler_args, generate_debug_info); unsigned num_errors = parser.Parse (error_stream); Index: source/Interpreter/Args.cpp =================================================================== --- source/Interpreter/Args.cpp +++ source/Interpreter/Args.cpp @@ -647,6 +647,20 @@ } OptionParser::Prepare(); int val; + + // Before parsing arguments, insert quote char to the head of the string. + // So quoted arguments like "-l" won't be treated as option. + int argv_iter = 0; + for (auto args_iter = m_args.begin(); args_iter != m_args.end(); args_iter++, argv_iter++) + { + char quote_char = GetArgumentQuoteCharAtIndex(argv_iter); + if (quote_char != '\0') + { + *args_iter = std::string(1, quote_char) + *args_iter; + m_argv[argv_iter] = args_iter->c_str(); + } + } + while (1) { int long_options_index = -1; @@ -696,8 +710,23 @@ } else { + const char *value = OptionParser::GetOptionArgument(); + if (value) + { + // Remove leading quote char from option value + argv_iter = 0; + for (auto args_iter = m_args.begin(); args_iter != m_args.end(); args_iter++, argv_iter++) + { + if (*args_iter == value && GetArgumentQuoteCharAtIndex(argv_iter) != '\0') + { + *args_iter = args_iter->substr(1); + value = args_iter->c_str(); + break; + } + } + } error = options.SetOptionValue(long_options_index, - (def->option_has_arg == OptionParser::eNoArgument) ? nullptr : OptionParser::GetOptionArgument()); + (def->option_has_arg == OptionParser::eNoArgument) ? nullptr : value); } } else @@ -711,6 +740,19 @@ // Update our ARGV now that get options has consumed all the options m_argv.erase(m_argv.begin(), m_argv.begin() + OptionParser::GetOptionIndex()); UpdateArgsAfterOptionParsing (); + + // Remove leading quote char from other arguments. + argv_iter = 0; + for (auto args_iter = m_args.begin(); args_iter != m_args.end(); args_iter++, argv_iter++) + { + char quote_char = GetArgumentQuoteCharAtIndex(argv_iter); + if (quote_char != '\0') + { + *args_iter = args_iter->substr(1); + m_argv[argv_iter] = args_iter->c_str(); + } + } + return error; } Index: source/Target/Target.cpp =================================================================== --- source/Target/Target.cpp +++ source/Target/Target.cpp @@ -2653,6 +2653,7 @@ { "breakpoints-use-platform-avoid-list", OptionValue::eTypeBoolean , false, true , NULL, NULL, "Consult the platform module avoid list when setting non-module specific breakpoints." }, { "arg0" , OptionValue::eTypeString , false, 0 , NULL, NULL, "The first argument passed to the program in the argument array which can be different from the executable itself." }, { "run-args" , OptionValue::eTypeArgs , false, 0 , NULL, NULL, "A list containing all the arguments to be passed to the executable when it is run. Note that this does NOT include the argv[0] which is in target.arg0." }, + { "expr-parser-compiler-args" , OptionValue::eTypeArgs , false, 0 , NULL, NULL, "A list containing all the arguments to be passed to the expression parser compiler." }, { "env-vars" , OptionValue::eTypeDictionary, false, OptionValue::eTypeString , NULL, NULL, "A list of all the environment variables to be passed to the executable's environment, and their values." }, { "inherit-env" , OptionValue::eTypeBoolean , false, true , NULL, NULL, "Inherit the environment from the process that is running LLDB." }, { "input-path" , OptionValue::eTypeFileSpec , false, 0 , NULL, NULL, "The file/path to be used by the executable program for reading its standard input." }, @@ -2701,6 +2702,7 @@ ePropertyBreakpointUseAvoidList, ePropertyArg0, ePropertyRunArgs, + ePropertyExprParserCompilerArgs, ePropertyEnvVars, ePropertyInheritEnv, ePropertyInputPath, @@ -2957,6 +2959,20 @@ } void +TargetProperties::SetExprParserCompilerArguments (const Args &args) +{ + const uint32_t idx = ePropertyExprParserCompilerArgs; + m_collection_sp->SetPropertyAtIndexFromArgs (NULL, idx, args); +} + +bool +TargetProperties::GetExprParserCompilerArguments (Args &args) const +{ + const uint32_t idx = ePropertyExprParserCompilerArgs; + return m_collection_sp->GetPropertyAtIndexAsArgs (NULL, idx, args); +} + +void TargetProperties::SetRunArguments (const Args &args) { const uint32_t idx = ePropertyRunArgs;