Skip to content

Commit 3aa83e5

Browse files
Axel-NaumannAxel-Naumann
committed
[cling] Lifetime of MetaParser is that of its input:
Before, MetaParser might have pointed to a StringRef whose storage was gone, see asan failure in roottest/cling/other/runfileClose.C below. This was caused by recursive uses of MetaParser; see stack trace below: the inner recursion returned, but as the same MetaParser object was used by both frames, the objects cursor now pointed to freed memory. Instead, create a MetaParser (and MetaLexer) object per input. That way, their lifetime corresponds to the lifetime of their input. ================================================================= ==529104==ERROR: AddressSanitizer: stack-use-after-return on address 0x7ffff3afd82a at pc 0x7fffea18df6d bp 0x7fffffff8170 sp 0x7fffffff8168 READ of size 1 at 0x7ffff3afd82a thread T0 [Detaching after fork from child process 529183] #0 0x7fffea18df6c in cling::MetaLexer::Lex(cling::Token&) src/interpreter/cling/lib/MetaProcessor/MetaLexer.cpp:58:11 #1 0x7fffea190d7c in cling::MetaParser::lookAhead(unsigned int) src/interpreter/cling/lib/MetaProcessor/MetaParser.cpp:89:15 #2 0x7fffea190bd5 in cling::MetaParser::consumeToken() src/interpreter/cling/lib/MetaProcessor/MetaParser.cpp:49:5 #3 0x7fffea191d4d in cling::MetaParser::isLCommand(cling::MetaSema::ActionResult&) src/interpreter/cling/lib/MetaProcessor/MetaParser.cpp:147:9 #4 0x7fffea1914dd in cling::MetaParser::isCommand(cling::MetaSema::ActionResult&, cling::Value*) src/interpreter/cling/lib/MetaProcessor/MetaParser.cpp:123:12 #5 0x7fffea191216 in cling::MetaParser::isMetaCommand(cling::MetaSema::ActionResult&, cling::Value*) src/interpreter/cling/lib/MetaProcessor/MetaParser.cpp:101:33 #6 0x7fffea14e5aa in cling::MetaProcessor::process(llvm::StringRef, cling::Interpreter::CompilationResult&, cling::Value*, bool) src/interpreter/cling/lib/MetaProcessor/MetaProcessor.cpp:317:24 #7 0x7fffe99b67b7 in HandleInterpreterException(cling::MetaProcessor*, char const*, cling::Interpreter::CompilationResult&, cling::Value*) src/core/metacling/src/TCling.cxx:2431:29 #8 0x7fffe99bde30 in TCling::Load(char const*, bool) src/core/metacling/src/TCling.cxx:3454:10 #9 0x7ffff7865f11 in TSystem::Load(char const*, char const*, bool) src/core/base/src/TSystem.cxx:1941:27 #10 0x7ffff7b8a0e3 in TUnixSystem::Load(char const*, char const*, bool) src/core/unix/src/TUnixSystem.cxx:2789:20 #11 0x7fffd78dd08b (<unknown module>) #12 0x7fffe9f8a5d9 in cling::IncrementalExecutor::executeWrapper(llvm::StringRef, cling::Value*) const src/interpreter/cling/lib/Interpreter/IncrementalExecutor.cpp:376:3 #13 0x7fffe9d73dc2 in cling::Interpreter::RunFunction(clang::FunctionDecl const*, cling::Value*) src/interpreter/cling/lib/Interpreter/Interpreter.cpp:1141:20 #14 0x7fffe9d6e317 in cling::Interpreter::EvaluateInternal(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cling::CompilationOptions, cling::Value*, cling::Transaction**, unsigned long) src/interpreter/cling/lib/Interpreter/Interpreter.cpp:1391:29 #15 0x7fffe9d6c1fe in cling::Interpreter::process(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cling::Value*, cling::Transaction**, bool) src/interpreter/cling/lib/Interpreter/Interpreter.cpp:819:9 #16 0x7fffea151826 in cling::MetaProcessor::readInputFromFile(llvm::StringRef, cling::Value*, unsigned long, bool) src/interpreter/cling/lib/MetaProcessor/MetaProcessor.cpp:507:22 #17 0x7fffe99b585b in TCling::ProcessLine(char const*, TInterpreter::EErrorCode*) src/core/metacling/src/TCling.cxx:2570:39 #18 0x7fffe99bbfee in TCling::ProcessLineSynch(char const*, TInterpreter::EErrorCode*) src/core/metacling/src/TCling.cxx:3496:17 #19 0x7ffff77203d3 in TApplication::ExecuteFile(char const*, int*, bool) src/core/base/src/TApplication.cxx:1608:30 #20 0x7ffff771ebdf in TApplication::ProcessFile(char const*, int*, bool) src/core/base/src/TApplication.cxx:1480:11 #21 0x7ffff771e385 in TApplication::ProcessLine(char const*, bool, int*) src/core/base/src/TApplication.cxx:1453:14 #22 0x7ffff7f8157a in TRint::ProcessLineNr(char const*, char const*, int*) src/core/rint/src/TRint.cxx:766:11 root-project#23 0x7ffff7f802f0 in TRint::Run(bool) src/core/rint/src/TRint.cxx:424:22 root-project#24 0x4ff96d in main src/main/src/rmain.cxx:30:12 root-project#25 0x7ffff6e040b2 in __libc_start_main /build/glibc-YbNSs7/glibc-2.31/csu/../csu/libc-start.c:308:16 root-project#26 0x41f35d in _start (asan/bin/root.exe+0x41f35d) Address 0x7ffff3afd82a is located in stack of thread T0 at offset 42 in frame #0 0x7fffe99b3d8f in TCling::ProcessLine(char const*, TInterpreter::EErrorCode*) src/core/metacling/src/TCling.cxx:2456 This frame has 21 object(s): [32, 56) 'sLine' (line 2462) <== Memory access at offset 42 is inside this variable [96, 104) 'R__guard2471' (line 2471) [128, 136) 'R__guard2488' (line 2488) [160, 176) 'interpreterFlagsRAII' (line 2491) [192, 240) 'result' (line 2511) [272, 276) 'compRes' (line 2512) [288, 312) 'mod_line' (line 2517) [352, 376) 'aclicMode' (line 2518) [416, 440) 'arguments' (line 2519) [480, 504) 'io' (line 2520) [544, 568) 'fname' (line 2521) [608, 632) 'ref.tmp' (line 2547) [672, 696) 'ref.tmp145' (line 2547) [736, 768) 'code' (line 2555) [800, 832) 'codeline' (line 2556) [864, 1384) 'in' (line 2559) [1520, 1552) 'ref.tmp176' (line 2562) [1584, 1600) 'agg.tmp' [1616, 1624) 'ref.tmp198' (line 2568) [1648, 1664) 'agg.tmp207' [1680, 1696) 'autoParseRaii' (line 2588) HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork (longjmp and C++ exceptions *are* supported) SUMMARY: AddressSanitizer: stack-use-after-return src/interpreter/cling/lib/MetaProcessor/MetaLexer.cpp:58:11 in cling::MetaLexer::Lex(cling::Token&) Shadow bytes around the buggy address: 0x10007e757ab0: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757ac0: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757ad0: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757ae0: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757af0: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 =>0x10007e757b00: f5 f5 f5 f5 f5[f5]f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757b10: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757b20: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757b30: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757b40: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 0x10007e757b50: f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 f5 Shadow byte legend (one shadow byte represents 8 application bytes): Addressable: 00 Partially addressable: 01 02 03 04 05 06 07 Heap left redzone: fa Freed heap region: fd Stack left redzone: f1 Stack mid redzone: f2 Stack right redzone: f3 Stack after return: f5 Stack use after scope: f8 Global redzone: f9 Global init order: f6 Poisoned by user: f7 Container overflow: fc Array cookie: ac Intra object redzone: bb ASan internal: fe Left alloca redzone: ca Right alloca redzone: cb Shadow gap: cc ==529104==ABORTING at src/interpreter/cling/lib/MetaProcessor/MetaLexer.cpp:49 at src/interpreter/cling/lib/MetaProcessor/MetaParser.cpp:41 compRes=@0x7ffff3afd910: cling::Interpreter::kSuccess, result=0x7ffff3afd8c0, disableValuePrinting=false) at src/interpreter/cling/lib/MetaProcessor/MetaProcessor.cpp:314 input_line=0x7ffff3afd829 "#define XYZ 21", compRes=@0x7ffff3afd910: cling::Interpreter::kSuccess, result=0x7ffff3afd8c0) at src/core/metacling/src/TCling.cxx:2431 error=0x7fffd78cb0f4 <x>) at src/core/metacling/src/TCling.cxx:2591 sync=false, err=0x7fffd78cb0f4 <x>) at src/core/base/src/TApplication.cxx:1472 line=0x7fffd78c9000 "#define XYZ 21", error=0x7fffd78cb0f4 <x>) at src/core/base/src/TROOT.cxx:2328 from asan/roottest/cling/other/fileClose_C.so filename=0x6070000f0fd0 "asan/roottest/cling/other/fileClose_C.so", flag=257) at /home/axel/build/llvm/llvm-project/compiler-rt/lib/asan/../sanitizer_common/sanitizer_common_interceptors.inc:6270 at src/interpreter/cling/lib/Utils/PlatformPosix.cpp:118 permanent=false, resolved=true) at src/interpreter/cling/lib/Interpreter/DynamicLibraryManager.cpp:184 at src/interpreter/cling/lib/Interpreter/Interpreter.cpp:1444 T=0x0) at src/interpreter/cling/lib/Interpreter/Interpreter.cpp:1560 at src/interpreter/cling/lib/MetaProcessor/MetaSema.cpp:57 actionResult=@0x7ffff39532b0: cling::MetaSema::AR_Success)
1 parent 3c11e8b commit 3aa83e5

File tree

4 files changed

+47
-53
lines changed

4 files changed

+47
-53
lines changed

‎interpreter/cling/include/cling/MetaProcessor/MetaParser.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace cling {
6565
class MetaParser {
6666
private:
6767
MetaLexer m_Lexer;
68-
std::unique_ptr<MetaSema> m_Actions;
68+
MetaSema &m_Actions;
6969
llvm::SmallVector<Token, 2> m_TokenCache;
7070
llvm::SmallVector<Token, 4> m_MetaSymbolCache;
7171
private:
@@ -113,8 +113,7 @@ namespace cling {
113113
bool isShellCommand(MetaSema::ActionResult& actionResult,
114114
Value* resultValue);
115115
public:
116-
MetaParser(MetaSema* Actions);
117-
void enterNewInputLine(llvm::StringRef Line);
116+
MetaParser(MetaSema &Actions, llvm::StringRef Line);
118117

119118
///\brief Drives the recursive decendent parsing.
120119
///
@@ -127,7 +126,7 @@ namespace cling {
127126
///
128127
bool isQuitRequested() const;
129128

130-
MetaSema& getActions() const { return *m_Actions.get(); }
129+
MetaSema& getActions() const { return m_Actions; }
131130
};
132131
} // end namespace cling
133132

‎interpreter/cling/include/cling/MetaProcessor/MetaProcessor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace cling {
2424

2525
class Interpreter;
2626
class InputValidator;
27-
class MetaParser;
27+
class MetaSema;
2828
class Value;
2929

3030
///\brief Class that helps processing meta commands, which add extra
@@ -43,7 +43,7 @@ namespace cling {
4343

4444
///\brief The parser used to parse our tiny "meta" language
4545
///
46-
std::unique_ptr<MetaParser> m_MetaParser;
46+
std::unique_ptr<MetaSema> m_MetaSema;
4747

4848
///\brief Currently executing file as passed into executeFile
4949
///

‎interpreter/cling/lib/MetaProcessor/MetaParser.cpp‎

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
namespace cling {
2626

27-
MetaParser::MetaParser(MetaSema* Actions) : m_Lexer("") {
28-
m_Actions.reset(Actions);
29-
const InvocationOptions& Opts = Actions->getInterpreter().getOptions();
27+
MetaParser::MetaParser(MetaSema &Actions, llvm::StringRef Line) :
28+
m_Lexer(Line), m_Actions(Actions) {
29+
const InvocationOptions& Opts = Actions.getInterpreter().getOptions();
3030
MetaLexer metaSymbolLexer(Opts.MetaString);
3131
Token Tok;
3232
while(true) {
@@ -37,11 +37,6 @@ namespace cling {
3737
}
3838
}
3939

40-
void MetaParser::enterNewInputLine(llvm::StringRef Line) {
41-
m_Lexer.reset(Line);
42-
m_TokenCache.clear();
43-
}
44-
4540
void MetaParser::consumeToken() {
4641
if (m_TokenCache.size())
4742
m_TokenCache.erase(m_TokenCache.begin());
@@ -102,7 +97,7 @@ namespace cling {
10297
}
10398

10499
bool MetaParser::isQuitRequested() const {
105-
return m_Actions->isQuitRequested();
100+
return m_Actions.isQuitRequested();
106101
}
107102

108103
bool MetaParser::isCommandSymbol() {
@@ -143,11 +138,11 @@ namespace cling {
143138
consumeAnyStringToken(tok::comment);
144139
if (getCurTok().is(tok::raw_ident)) {
145140
result = true;
146-
actionResult = m_Actions->actOnLCommand(getCurTok().getIdent());
141+
actionResult = m_Actions.actOnLCommand(getCurTok().getIdent());
147142
consumeToken();
148143
if (getCurTok().is(tok::comment)) {
149144
consumeAnyStringToken(tok::eof);
150-
m_Actions->actOnComment(getCurTok().getIdent());
145+
m_Actions.actOnComment(getCurTok().getIdent());
151146
}
152147
}
153148
}
@@ -168,7 +163,7 @@ namespace cling {
168163
if (getCurTok().is(tok::raw_ident)) {
169164
result = true;
170165
std::string outputFile = getCurTok().getIdent();
171-
actionResult = m_Actions->actOnTCommand(inputFile, outputFile);
166+
actionResult = m_Actions.actOnTCommand(inputFile, outputFile);
172167
}
173168
}
174169
}
@@ -257,9 +252,9 @@ namespace cling {
257252
}
258253
// Empty file means std.
259254
actionResult =
260-
m_Actions->actOnRedirectCommand(file/*file*/,
261-
stream/*which stream to redirect*/,
262-
append/*append mode*/);
255+
m_Actions.actOnRedirectCommand(file/*file*/,
256+
stream/*which stream to redirect*/,
257+
append/*append mode*/);
263258
return true;
264259
}
265260
return false;
@@ -316,7 +311,7 @@ namespace cling {
316311

317312
if (args.empty())
318313
args = "()";
319-
actionResult = m_Actions->actOnxCommand(file, args, resultValue);
314+
actionResult = m_Actions.actOnxCommand(file, args, resultValue);
320315
return true;
321316
}
322317

@@ -335,7 +330,7 @@ namespace cling {
335330
bool result = false;
336331
if (getCurTok().is(tok::ident) && getCurTok().getIdent().equals("q")) {
337332
result = true;
338-
m_Actions->actOnqCommand();
333+
m_Actions.actOnqCommand();
339334
}
340335
return result;
341336
}
@@ -346,7 +341,7 @@ namespace cling {
346341
llvm::StringRef path;
347342
if (getCurTok().is(tok::raw_ident)) {
348343
path = getCurTok().getIdent();
349-
actionResult = m_Actions->actOnUCommand(path);
344+
actionResult = m_Actions.actOnUCommand(path);
350345
return true;
351346
}
352347
}
@@ -361,7 +356,7 @@ namespace cling {
361356
llvm::StringRef path;
362357
if (getCurTok().is(tok::raw_ident))
363358
path = getCurTok().getIdent();
364-
m_Actions->actOnICommand(path);
359+
m_Actions.actOnICommand(path);
365360
return true;
366361
}
367362
return false;
@@ -378,7 +373,7 @@ namespace cling {
378373
consumeAnyStringToken(tok::eof);
379374
if (getCurTok().is(tok::raw_ident))
380375
return false;
381-
actionResult = m_Actions->actOnOCommand(level);
376+
actionResult = m_Actions.actOnOCommand(level);
382377
return true;
383378
}
384379
} else {
@@ -389,11 +384,11 @@ namespace cling {
389384
int level = 0;
390385
if (!lastStringToken.getIdent().getAsInteger(10, level)
391386
&& level >= 0) {
392-
actionResult = m_Actions->actOnOCommand(level);
387+
actionResult = m_Actions.actOnOCommand(level);
393388
return true;
394389
}
395390
} else {
396-
m_Actions->actOnOCommand();
391+
m_Actions.actOnOCommand();
397392
actionResult = MetaSema::AR_Success;
398393
return true;
399394
}
@@ -409,7 +404,7 @@ namespace cling {
409404
) {
410405
consumeToken();
411406
skipWhitespace();
412-
m_Actions->actOnAtCommand();
407+
m_Actions.actOnAtCommand();
413408
return true;
414409
}
415410
return false;
@@ -423,7 +418,7 @@ namespace cling {
423418
skipWhitespace();
424419
if (getCurTok().is(tok::constant))
425420
mode = (MetaSema::SwitchMode)getCurTok().getConstantAsBool();
426-
m_Actions->actOnrawInputCommand(mode);
421+
m_Actions.actOnrawInputCommand(mode);
427422
return true;
428423
}
429424
return false;
@@ -437,7 +432,7 @@ namespace cling {
437432
skipWhitespace();
438433
if (getCurTok().is(tok::constant))
439434
mode = getCurTok().getConstant();
440-
m_Actions->actOndebugCommand(mode);
435+
m_Actions.actOndebugCommand(mode);
441436
return true;
442437
}
443438
return false;
@@ -451,7 +446,7 @@ namespace cling {
451446
skipWhitespace();
452447
if (getCurTok().is(tok::constant))
453448
mode = (MetaSema::SwitchMode)getCurTok().getConstantAsBool();
454-
m_Actions->actOnprintDebugCommand(mode);
449+
m_Actions.actOnprintDebugCommand(mode);
455450
return true;
456451
}
457452
return false;
@@ -467,7 +462,7 @@ namespace cling {
467462
return false; // FIXME: Issue proper diagnostics
468463
std::string ident = getCurTok().getIdentNoQuotes();
469464
consumeToken();
470-
m_Actions->actOnstoreStateCommand(ident);
465+
m_Actions.actOnstoreStateCommand(ident);
471466
return true;
472467
}
473468
return false;
@@ -483,7 +478,7 @@ namespace cling {
483478
return false; // FIXME: Issue proper diagnostics
484479
std::string ident = getCurTok().getIdentNoQuotes();
485480
consumeToken();
486-
m_Actions->actOncompareStateCommand(ident);
481+
m_Actions.actOncompareStateCommand(ident);
487482
return true;
488483
}
489484
return false;
@@ -500,7 +495,7 @@ namespace cling {
500495
consumeToken();
501496
skipWhitespace();
502497
const Token& next = getCurTok();
503-
m_Actions->actOnstatsCommand(what, next.is(tok::ident)
498+
m_Actions.actOnstatsCommand(what, next.is(tok::ident)
504499
? next.getIdent() : llvm::StringRef());
505500
return true;
506501
}
@@ -518,7 +513,7 @@ namespace cling {
518513
llvm::StringRef ident = getCurTok().getIdent();
519514
consumeToken();
520515
skipWhitespace();
521-
m_Actions->actOnstatsCommand(ident.equals("ast")
516+
m_Actions.actOnstatsCommand(ident.equals("ast")
522517
? llvm::StringRef("asttree") : ident,
523518
getCurTok().is(tok::ident) ? getCurTok().getIdent() : llvm::StringRef());
524519
consumeToken();
@@ -534,9 +529,9 @@ namespace cling {
534529
skipWhitespace();
535530
const Token& next = getCurTok();
536531
if (next.is(tok::constant))
537-
m_Actions->actOnUndoCommand(next.getConstant());
532+
m_Actions.actOnUndoCommand(next.getConstant());
538533
else
539-
m_Actions->actOnUndoCommand();
534+
m_Actions.actOnUndoCommand();
540535
return true;
541536
}
542537
return false;
@@ -550,7 +545,7 @@ namespace cling {
550545
skipWhitespace();
551546
if (getCurTok().is(tok::constant))
552547
mode = (MetaSema::SwitchMode)getCurTok().getConstantAsBool();
553-
m_Actions->actOndynamicExtensionsCommand(mode);
548+
m_Actions.actOndynamicExtensionsCommand(mode);
554549
return true;
555550
}
556551
return false;
@@ -560,23 +555,23 @@ namespace cling {
560555
const Token& Tok = getCurTok();
561556
if (Tok.is(tok::quest_mark) ||
562557
(Tok.is(tok::ident) && Tok.getIdent().equals("help"))) {
563-
m_Actions->actOnhelpCommand();
558+
m_Actions.actOnhelpCommand();
564559
return true;
565560
}
566561
return false;
567562
}
568563

569564
bool MetaParser::isfileExCommand() {
570565
if (getCurTok().is(tok::ident) && getCurTok().getIdent().equals("fileEx")) {
571-
m_Actions->actOnfileExCommand();
566+
m_Actions.actOnfileExCommand();
572567
return true;
573568
}
574569
return false;
575570
}
576571

577572
bool MetaParser::isfilesCommand() {
578573
if (getCurTok().is(tok::ident) && getCurTok().getIdent().equals("files")) {
579-
m_Actions->actOnfilesCommand();
574+
m_Actions.actOnfilesCommand();
580575
return true;
581576
}
582577
return false;
@@ -591,11 +586,11 @@ namespace cling {
591586
llvm::StringRef className;
592587
if (NextTok.is(tok::raw_ident))
593588
className = NextTok.getIdent();
594-
m_Actions->actOnclassCommand(className);
589+
m_Actions.actOnclassCommand(className);
595590
return true;
596591
}
597592
else if (Tok.getIdent().equals("Class")) {
598-
m_Actions->actOnClassCommand();
593+
m_Actions.actOnClassCommand();
599594
return true;
600595
}
601596
}
@@ -609,7 +604,7 @@ namespace cling {
609604
consumeAnyStringToken(tok::eof);
610605
if (getCurTok().is(tok::raw_ident))
611606
return false;
612-
m_Actions->actOnNamespaceCommand();
607+
m_Actions.actOnNamespaceCommand();
613608
return true;
614609
}
615610
}
@@ -623,7 +618,7 @@ namespace cling {
623618
llvm::StringRef varName;
624619
if (getCurTok().is(tok::ident))
625620
varName = getCurTok().getIdent();
626-
m_Actions->actOngCommand(varName);
621+
m_Actions.actOngCommand(varName);
627622
return true;
628623
}
629624
return false;
@@ -638,7 +633,7 @@ namespace cling {
638633
llvm::StringRef typedefName;
639634
if (NextTok.is(tok::raw_ident))
640635
typedefName = NextTok.getIdent();
641-
m_Actions->actOnTypedefCommand(typedefName);
636+
m_Actions.actOnTypedefCommand(typedefName);
642637
return true;
643638
}
644639
}
@@ -656,7 +651,7 @@ namespace cling {
656651
if (NextTok.is(tok::raw_ident)) {
657652
llvm::StringRef commandLine(NextTok.getIdent());
658653
if (!commandLine.empty())
659-
actionResult = m_Actions->actOnShellCommand(commandLine,
654+
actionResult = m_Actions.actOnShellCommand(commandLine,
660655
resultValue);
661656
}
662657
return true;

‎interpreter/cling/lib/MetaProcessor/MetaProcessor.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ namespace cling {
286286
MetaProcessor::MetaProcessor(Interpreter& interp, raw_ostream& outs)
287287
: m_Interp(interp), m_Outs(&outs) {
288288
m_InputValidator.reset(new InputValidator());
289-
m_MetaParser.reset(new MetaParser(new MetaSema(interp, *this)));
289+
m_MetaSema.reset(new MetaSema(interp, *this));
290290
}
291291

292292
MetaProcessor::~MetaProcessor() {
@@ -311,12 +311,12 @@ namespace cling {
311311
}
312312

313313
// Check for and handle meta commands.
314-
m_MetaParser->enterNewInputLine(input_line);
314+
MetaParser parser(*m_MetaSema, input_line);
315315
MetaSema::ActionResult actionResult = MetaSema::AR_Success;
316316
if (!m_InputValidator->inBlockComment() &&
317-
m_MetaParser->isMetaCommand(actionResult, result)) {
317+
parser.isMetaCommand(actionResult, result)) {
318318

319-
if (m_MetaParser->isQuitRequested())
319+
if (parser.isQuitRequested())
320320
return -1;
321321

322322
if (actionResult != MetaSema::AR_Success)
@@ -525,7 +525,7 @@ namespace cling {
525525

526526
void MetaProcessor::registerUnloadPoint(const Transaction* T,
527527
llvm::StringRef filename) {
528-
m_MetaParser->getActions().registerUnloadPoint(T, filename);
528+
m_MetaSema->registerUnloadPoint(T, filename);
529529
}
530530

531531
} // end namespace cling

0 commit comments

Comments
 (0)