llvmbot wrote:

<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang

Author: Jason Van Beusekom (Jason-Van-Beusekom)

<details>
<summary>Changes</summary>

Fix from 
https://github.com/llvm/llvm-project/commit/b23438661c1056bae385daba1501afb762d1e336
 to fix formatting error and test failure: 
https://lab.llvm.org/staging/#/builders/105/builds/43970

---
Full diff: https://github.com/llvm/llvm-project/pull/184369.diff


2 Files Affected:

- (modified) clang/lib/CodeGen/CGExpr.cpp (+1-1) 
- (modified) clang/lib/Serialization/ASTWriter.cpp (+2-1) 


``````````diff
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 3fe2850e4587e..eebb36276e0eb 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -7026,7 +7026,7 @@ RValue CodeGenFunction::EmitCall(QualType CalleeType,
   //
   // This is used for the indirect function case, virtual function case is
   // handled in ItaniumCXXABI.cpp
-  if (getLangOpts().OpenMPIsTargetDevice &&
+  if (getLangOpts().OpenMPIsTargetDevice && CGM.getTriple().isGPU() &&
       (!TargetDecl || !isa<FunctionDecl>(TargetDecl))) {
     const Expr *CalleeExpr = E->getCallee()->IgnoreParenImpCasts();
     const DeclRefExpr *DRE = nullptr;
diff --git a/clang/lib/Serialization/ASTWriter.cpp 
b/clang/lib/Serialization/ASTWriter.cpp
index 2d0f257d02d6d..814f4e42e9c9b 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -7825,7 +7825,8 @@ void ASTWriter::DeclarationMarkedOpenMPAllocate(const 
Decl *D, const Attr *A) {
 }
 
 void ASTWriter::DeclarationMarkedOpenMPIndirectCall(const Decl *D) {
-  if (Chain && Chain->isProcessingUpdateRecords()) return;
+  if (Chain && Chain->isProcessingUpdateRecords())
+    return;
   assert(!WritingAST && "Already writing the AST!");
   if (!D->isFromASTFile())
     return;

``````````

</details>


https://github.com/llvm/llvm-project/pull/184369
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to