Address more review comments

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>

Author: steffenlarsen

clang/lib/CodeGen/CodeGenModule.cpp

@@ -534,7 +534,7 @@ static llvm::MDNode *getAspectEnumValueMD(ASTContext &ASTContext,
   AspectEnumValMD.push_back(llvm::MDString::get(Ctx, ECD->getName()));
   AspectEnumValMD.push_back(
       llvm::ConstantAsMetadata::get(llvm::ConstantInt::get(
-          llvm::Type::getInt32Ty(Ctx), ECD->getInitVal().getZExtValue())));
+          llvm::Type::getInt32Ty(Ctx), ECD->getInitVal().getSExtValue())));
   return llvm::MDNode::get(Ctx, AspectEnumValMD);
 }
 

clang/test/CodeGenSYCL/Inputs/sycl.hpp

@@ -70,7 +70,7 @@ enum class address_space : int {
 } // namespace access
 
 // Dummy aspect enum with limited enumerators
-enum class __SYCL_TYPE(aspect) aspect {
+enum class __SYCL_TYPE(aspect) aspect { // #AspectEnum
   host = 0,
   cpu = 1,
   gpu = 2,

clang/test/CodeGenSYCL/multiple_aspect_enum.cpp

@@ -1,19 +1,10 @@
-// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -fsyntax-only -verify -emit-llvm-only %s
+// RUN: %clang_cc1 -internal-isystem %S/Inputs -fsycl-is-device -triple spir64-unknown-unknown -fsyntax-only -verify -emit-llvm-only %s
 
 // Tests for error diagnostics when multiple definitions of
 // [[__sycl_detail__::sycl_type(aspect)]] enums are present.
+#include "sycl.hpp"
 
-// expected-note@+1{{previous definition is here}}
-enum class [[__sycl_detail__::sycl_type(aspect)]] aspect {
-  host = 0,
-  cpu = 1,
-  gpu = 2,
-  accelerator = 3,
-  custom = 4,
-  fp16 = 5,
-  fp64 = 6,
-  future_aspect = 12
-};
+// expected-note@#AspectEnum{{previous definition is here}}
 
 // expected-error@+1{{redefinition of aspect enum}}
 enum class [[__sycl_detail__::sycl_type(aspect)]] aspect_redef {

llvm/lib/SYCLLowerIR/SYCLPropagateAspectsUsage.cpp

@@ -83,7 +83,7 @@ using AspectValueToNameMapTy = SmallMapVector<StringRef, int, 32>;
 
 /// Retrieves from metadata (sycl_aspects) the mapping between SYCL aspect names
 /// and their integral values.
-AspectValueToNameMapTy getSYCLAspectsFromMetadata(const Module &M) {
+AspectValueToNameMapTy getAspectsFromMetadata(const Module &M) {
   const NamedMDNode *Node = M.getNamedMetadata("sycl_aspects");
   AspectValueToNameMapTy Result;
   if (!Node)
@@ -136,7 +136,7 @@ void propagateAspectsThroughTypes(const TypesEdgesTy &Edges, const Type *Start,
 /// another type TT, which in turn uses the aspect A.
 /// @TypesWithAspects argument consist of known types with aspects
 /// from metadata information.
-/// @AspectValues argument consist of known known aspect values and their names.
+/// @AspectValues argument consist of known aspect values and their names.
 ///
 /// The algorithm is the following:
 /// 1) Make a list of all structure types from module @M. The list also
@@ -362,7 +362,7 @@ buildFunctionsToAspectsMap(Module &M, TypeToAspectsMapTy &TypesWithAspects) {
 PreservedAnalyses
 SYCLPropagateAspectsUsagePass::run(Module &M, ModuleAnalysisManager &MAM) {
   TypeToAspectsMapTy TypesWithAspects = getTypesThatUseAspectsFromMetadata(M);
-  AspectValueToNameMapTy AspectValues = getSYCLAspectsFromMetadata(M);
+  AspectValueToNameMapTy AspectValues = getAspectsFromMetadata(M);
 
   // If there is no metadata for aspect values the source code must not have
   // included the SYCL headers. In that case there should also not be any types