Resolve merge conflicts

Signed-off-by: yronglin <[email protected]>

Author: yronglin

clang/include/clang/Lex/Preprocessor.h

@@ -1789,9 +1789,6 @@ class Preprocessor {
   void HandleCXXImportDirective(Token Import);
   void HandleCXXModuleDirective(Token Module);
 
-  void setFirstPPToken(const Token &Tok) { FirstPPToken = Tok; }
-  Token getFirstPPToken() const { return FirstPPToken; }
-
   /// Callback invoked when the lexer sees one of export, import or module token
   /// at the start of a line.
   ///

clang/lib/Lex/Lexer.cpp

@@ -3752,9 +3752,6 @@ bool Lexer::Lex(Token &Result) {
   (void) isRawLex;
   bool returnedToken = LexTokenInternal(Result, atPhysicalStartOfLine);
 
-  if (returnedToken && Result.isFirstPPToken() && PP)
-    PP->setFirstPPToken(Result);
-
   // (After the LexTokenInternal call, the lexer might be destroyed.)
   assert((returnedToken || !isRawLex) && "Raw lex must succeed");
 

clang/test/CXX/module/dcl.dcl/dcl.module/dcl.module.import/p1.cppm

@@ -43,24 +43,6 @@ import x [[foo]]; // expected-warning {{unknown attribute 'foo' ignored}}
 import x [[noreturn]]; // expected-error {{'noreturn' attribute cannot be applied to a module import}}
 import x [[blarg::noreturn]]; // expected-warning-re {{unknown attribute 'blarg::noreturn' ignored{{.*}}}}
 
-import x.y;
-import x.; // expected-error {{expected a module name after 'import'}}
-import .x; // expected-error {{expected a module name after 'import'}}
-
-import blarg; // expected-error {{module 'blarg' not found}}
-
-int use_4 = c; // ok
-
-//--- test.implementation.cpp
-module a.b;
-
-import x;
-
-import x [[]];
-import x [[foo]]; // expected-warning {{unknown attribute 'foo' ignored}}
-import x [[noreturn]]; // expected-error {{'noreturn' attribute cannot be applied to a module import}}
-import x [[blarg::noreturn]]; // expected-warning-re {{unknown attribute 'blarg::noreturn' ignored{{.*}}}}
-
 import x.y;
 import x.; // expected-error {{expected identifier after '.' in module name}}
 import .x; // expected-error {{unknown type name 'import'}} \
@@ -78,7 +60,7 @@ import x;
 import x [[]];
 import x [[foo]]; // expected-warning {{unknown attribute 'foo' ignored}}
 import x [[noreturn]]; // expected-error {{'noreturn' attribute cannot be applied to a module import}}
-import x [[blarg::noreturn]]; // expected-warning {{unknown attribute 'noreturn' ignored}}
+import x [[blarg::noreturn]]; // expected-warning-re {{unknown attribute 'blarg::noreturn' ignored{{.*}}}}
 
 import x.y;
 import x.; // expected-error {{expected identifier after '.' in module name}}