Clang-Repl Error Recovery Bug Fix

[Purva-Chaudhari]

Summary

Currently there was re-declaration error if error was encountered in the same line (The recovery support acted only if this type of error was encountered in the first line of the program and not in subsequent lines )

Eg:

clang-repl> int i=9;
clang-repl> int j=9; err;
input_line_3:1:5: error: redefinition of 'j'
int j = 9;

[v.g.vassilev]

LGTM! Apologies for the delay.

[uabelho]

Hi,

I noticed that the testcase Interpreter/execute.cpp starts failing with this patch when run/compiled with asan:

Failed Tests (1):
  Clang :: Interpreter/execute.cpp

Seen in the buildbot run
https://lab.llvm.org/buildbot/#/builders/5/builds/24221

The run on the commit before passed:
https://lab.llvm.org/buildbot/#/builders/5/builds/24220

[v.g.vassilev]

In D123674#3546722, @uabelho wrote:

Hi,

I noticed that the testcase Interpreter/execute.cpp starts failing with this patch when run/compiled with asan:

Failed Tests (1):
  Clang :: Interpreter/execute.cpp

Seen in the buildbot run
https://lab.llvm.org/buildbot/#/builders/5/builds/24221

The run on the commit before passed:
https://lab.llvm.org/buildbot/#/builders/5/builds/24220

Thanks a lot for the notice @uabelho! I have reverted the patch while we are investigating.

@Purva-Chaudhari, can you take look and reproduce the asan failure locally?

[Purva-Chaudhari]

In D123674#3546738, @v.g.vassilev wrote:

In D123674#3546722, @uabelho wrote:

Hi,

I noticed that the testcase Interpreter/execute.cpp starts failing with this patch when run/compiled with asan:

Failed Tests (1):
  Clang :: Interpreter/execute.cpp

Seen in the buildbot run
https://lab.llvm.org/buildbot/#/builders/5/builds/24221

The run on the commit before passed:
https://lab.llvm.org/buildbot/#/builders/5/builds/24220

Thanks a lot for the notice @uabelho! I have reverted the patch while we are investigating.

@Purva-Chaudhari, can you take look and reproduce the asan failure locally?

Trying to look into it

[Purva-Chaudhari]

Fix asan test fail

clang/lib/Interpreter/IncrementalParser.cpp

if (Diags.hasErrorOccurred()) {
     assert(PreviousTU && "Must have a TU from the ASTContext initialization!");
     TranslationUnitDecl *FirstTU = MostRecentTU->getFirstDecl();
     assert(FirstTU);
     FirstTU->RedeclLink.setLatest(PreviousTU);
     C.TUDecl = PreviousTU;
     S.TUScope->setEntity(PreviousTU);
 
     // Clean up the lookup table
-    if (StoredDeclsMap *Map = PreviousTU->getLookupPtr()) {
+    if (StoredDeclsMap *Map = PreviousTU->getPrimaryContext()->getLookupPtr()) {
       for (auto I = Map->begin(); I != Map->end(); ++I) {
         StoredDeclsList &List = I->second;
         DeclContextLookupResult R = List.getLookupResult();
         for (NamedDecl *D : R)
           if (D->getTranslationUnitDecl() == MostRecentTU)
             List.remove(D);
         if (List.isNull())
           Map->erase(I);

clang/test/Interpreter/execute.cpp

+// RUN: clang-repl "int x = 10;" "int y=7; err;" "int y = 10;"
 // RUN: clang-repl "int i = 10;" 'extern "C" int printf(const char*,...);' \
 // RUN:            'auto r1 = printf("i = %d\n", i);' | FileCheck --check-prefix=CHECK-DRIVER %s
 // REQUIRES: host-supports-jit
 // UNSUPPORTED: system-aix
 // CHECK-DRIVER: i = 10
 // RUN: cat %s | clang-repl | FileCheck %s
 extern "C" int printf(const char *, ...);
 int i = 42;
 auto r1 = printf("i = %d\n", i);
 // CHECK: i = 42
 
 struct S { float f = 1.0; S *m = nullptr;} s;
 
 auto r2 = printf("S[f=%f, m=0x%llx]\n", s.f, reinterpret_cast<unsigned long long>(s.m));
 // CHECK-NEXT: S[f=1.000000, m=0x0]
 quit