Looks like this broke some bots: http://lab.llvm.org:8011/builders/clang-hexagon-elf/builds/11226/steps/check-all/logs/Clang%3A%3Arewrite-includes-messages.c
On 1 May 2014 08:45, Lubos Lunak <[email protected]> wrote: > Author: llunak > Date: Thu May 1 07:45:08 2014 > New Revision: 207756 > > URL: http://llvm.org/viewvc/llvm-project?rev=207756&view=rev > Log: > write a line marker right before adding included file > > Enclosing the original #include directive inside #if 0 adds lines, > so warning/errors messages would have the line number off in > "In file included from <file>:<line>:", so add line marker to fix this. > > > Added: > cfe/trunk/test/Frontend/Inputs/rewrite-includes-messages.h > cfe/trunk/test/Frontend/rewrite-includes-messages.c > Modified: > cfe/trunk/lib/Rewrite/Frontend/InclusionRewriter.cpp > cfe/trunk/test/Frontend/rewrite-includes-missing.c > cfe/trunk/test/Frontend/rewrite-includes-modules.c > cfe/trunk/test/Frontend/rewrite-includes.c > > Modified: cfe/trunk/lib/Rewrite/Frontend/InclusionRewriter.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/Frontend/InclusionRewriter.cpp?rev=207756&r1=207755&r2=207756&view=diff > ============================================================================== > --- cfe/trunk/lib/Rewrite/Frontend/InclusionRewriter.cpp (original) > +++ cfe/trunk/lib/Rewrite/Frontend/InclusionRewriter.cpp Thu May 1 07:45:08 > 2014 > @@ -383,6 +383,7 @@ bool InclusionRewriter::Process(FileID F > case tok::pp_import: { > CommentOutDirective(RawLex, HashToken, FromFile, EOL, > NextToWrite, > Line); > + WriteLineInfo(FileName, Line - 1, FileType, EOL, ""); > StringRef LineInfoExtra; > if (const FileChange *Change = FindFileChangeLocation( > HashToken.getLocation())) { > > Added: cfe/trunk/test/Frontend/Inputs/rewrite-includes-messages.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/Inputs/rewrite-includes-messages.h?rev=207756&view=auto > ============================================================================== > --- cfe/trunk/test/Frontend/Inputs/rewrite-includes-messages.h (added) > +++ cfe/trunk/test/Frontend/Inputs/rewrite-includes-messages.h Thu May 1 > 07:45:08 2014 > @@ -0,0 +1,4 @@ > +void f() > +{ > + int unused_variable; > +} > > Added: cfe/trunk/test/Frontend/rewrite-includes-messages.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/rewrite-includes-messages.c?rev=207756&view=auto > ============================================================================== > --- cfe/trunk/test/Frontend/rewrite-includes-messages.c (added) > +++ cfe/trunk/test/Frontend/rewrite-includes-messages.c Thu May 1 07:45:08 > 2014 > @@ -0,0 +1,8 @@ > +// RUN: %clang -E -frewrite-includes %s -I%S/Inputs/ | %clang -Wall > -Wunused-macros -x c -c - 2> %t.1 > +// RUN: %clang -I%S/Inputs/ -Wall -Wunused-macros -c %s 2> %t.2 > +// RUN: cmp -s %t.1 %t.2 > +// expected-no-diagnostics > +// REQUIRES: shell > + > +#include "rewrite-includes-messages.h" > +#define UNUSED_MACRO > > Modified: cfe/trunk/test/Frontend/rewrite-includes-missing.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/rewrite-includes-missing.c?rev=207756&r1=207755&r2=207756&view=diff > ============================================================================== > --- cfe/trunk/test/Frontend/rewrite-includes-missing.c (original) > +++ cfe/trunk/test/Frontend/rewrite-includes-missing.c Thu May 1 07:45:08 > 2014 > @@ -4,4 +4,5 @@ > // CHECK: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include "foobar.h" > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 3 "{{.*}}rewrite-includes-missing.c"{{$}} > // CHECK-NEXT: {{^}}# 4 "{{.*}}rewrite-includes-missing.c"{{$}} > > Modified: cfe/trunk/test/Frontend/rewrite-includes-modules.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/rewrite-includes-modules.c?rev=207756&r1=207755&r2=207756&view=diff > ============================================================================== > --- cfe/trunk/test/Frontend/rewrite-includes-modules.c (original) > +++ cfe/trunk/test/Frontend/rewrite-includes-modules.c Thu May 1 07:45:08 > 2014 > @@ -10,11 +10,13 @@ int foo(); > // CHECK-NEXT: #if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: #include <Module/Module.h>{{$}} > // CHECK-NEXT: #endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: # 5 "{{.*[/\\]}}rewrite-includes-modules.c"{{$}} > // CHECK-NEXT: @import Module; /* clang -frewrite-includes: implicit import > */{{$}} > // CHECK-NEXT: # 6 "{{.*[/\\]}}rewrite-includes-modules.c"{{$}} > // CHECK-NEXT: int foo();{{$}} > // CHECK-NEXT: #if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: #include <Module/Module.h>{{$}} > // CHECK-NEXT: #endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: # 7 "{{.*[/\\]}}rewrite-includes-modules.c"{{$}} > // CHECK-NEXT: @import Module; /* clang -frewrite-includes: implicit import > */{{$}} > // CHECK-NEXT: # 8 "{{.*[/\\]}}rewrite-includes-modules.c"{{$}} > > Modified: cfe/trunk/test/Frontend/rewrite-includes.c > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/rewrite-includes.c?rev=207756&r1=207755&r2=207756&view=diff > ============================================================================== > --- cfe/trunk/test/Frontend/rewrite-includes.c (original) > +++ cfe/trunk/test/Frontend/rewrite-includes.c Thu May 1 07:45:08 2014 > @@ -27,6 +27,7 @@ A(1,2) > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include "rewrite-includes1.h"{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 6 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes1.h" 1{{$}} > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#pragma clang system_header{{$}} > @@ -36,6 +37,7 @@ A(1,2) > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include "rewrite-includes2.h"{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 3 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes1.h" 3{{$}} > // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes2.h" 1 > 3{{$}} > // CHECK-NEXT: {{^}}included_line2{{$}} > // CHECK-NEXT: {{^}}# 4 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes1.h" 2 > 3{{$}} > @@ -45,6 +47,7 @@ A(1,2) > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include HEADER{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 9 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes3.h" 1{{$}} > // CHECK-NEXT: {{^}}included_line3{{$}} > // CHECK-NEXT: {{^}}# 10 "{{.*}}rewrite-includes.c" 2{{$}} > @@ -53,6 +56,7 @@ A(1,2) > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include "rewrite-includes4.h"{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 11 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 12 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}#endif{{$}} > // CHECK-NEXT: {{^}}# 13 "{{.*}}rewrite-includes.c"{{$}} > @@ -61,12 +65,14 @@ A(1,2) > // CHECK-NEXT: {{^}}#/**/include /**/ "rewrite-includes5.h" /**/ {{\\}}{{$}} > // CHECK-NEXT: {{^}} {{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 15 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes5.h" 1{{$}} > // CHECK-NEXT: {{^}}included_line5{{$}} > // CHECK-NEXT: {{^}}# 16 "{{.*}}rewrite-includes.c" 2{{$}} > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include "rewrite-includes6.h" // comment{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 16 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes6.h" 1{{$}} > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#pragma once{{$}} > @@ -79,10 +85,12 @@ A(1,2) > // CHECK-NEXT: {{^}}#include "rewrite-includes6.h" /* comment{{$}} > // CHECK-NEXT: {{^}} continues */{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 19 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 20 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include "rewrite-includes7.h"{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 20 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes7.h" 1{{$}} > // CHECK-NEXT: {{^}}#ifndef REWRITE_INCLUDES_7{{$}} > // CHECK-NEXT: {{^}}#define REWRITE_INCLUDES_7{{$}} > @@ -93,10 +101,12 @@ A(1,2) > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include "rewrite-includes7.h"{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 21 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 22 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} > // CHECK-NEXT: {{^}}#include "rewrite-includes8.h"{{$}} > // CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} > +// CHECK-NEXT: {{^}}# 22 "{{.*}}rewrite-includes.c"{{$}} > // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs(/|\\\\)}}rewrite-includes8.h" 1{{$}} > // CHECK-NEXT: {{^}}#if (1)/*__has_include_next(<rewrite-includes8.h>)*/{{$}} > // CHECK-NEXT: {{^}}#elif > (0)/*__has_include(<rewrite-includes8.hfail>)*/{{$}} > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
