This commit fixes the build failure due to OMP_TRAIT_PROPERTY macro r… (llvm#126222)

Ritanya-B-Bharadwaj · web-flow · commit 4c470d0c933c · 2025-02-09T18:33:03.000+05:30
…edefinition - llvm#126043
diff --git a/llvm/lib/Frontend/OpenMP/OMPContext.cpp b/llvm/lib/Frontend/OpenMP/OMPContext.cpp
@@ -67,7 +67,7 @@ OMPContext::OMPContext(bool IsDeviceCompilation, Triple TargetTriple,
         TargetOffloadTriple.getArch() == Triple::x86_64)                       \
       ActiveTraits.set(unsigned(TraitProperty::Enum));                         \
   }
-#undef OMP_TRAIT_PROPERTY
+#include "llvm/Frontend/OpenMP/OMPKinds.def"
   } else {
     // Add the appropriate device kind trait based on the triple and the
     // IsDeviceCompilation flag.

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ OMPContext::OMPContext(bool IsDeviceCompilation, Triple TargetTriple,`
`67`	`67`	`TargetOffloadTriple.getArch() == Triple::x86_64) \`
`68`	`68`	`ActiveTraits.set(unsigned(TraitProperty::Enum)); \`
`69`	`69`	`}`
`70`		`-#undef OMP_TRAIT_PROPERTY`
	`70`	`+#include "llvm/Frontend/OpenMP/OMPKinds.def"`
`71`	`71`	`} else {`
`72`	`72`	`// Add the appropriate device kind trait based on the triple and the`
`73`	`73`	`// IsDeviceCompilation flag.`