Revert unnecessary changes.

Author: bader

clang/lib/CodeGen/CodeGenModule.cpp

@@ -4245,19 +4245,9 @@ LangAS CodeGenModule::GetGlobalVarAddressSpace(const VarDecl *D) {
       return LangAS::sycl_local;
   }
 
-  if (LangOpts.SYCLIsDevice) {
-    AddrSpace = !D || (D->getType().getAddressSpace() == LangAS::Default)
-                    ? LangAS::sycl_global
-                    : D->getType().getAddressSpace();
-    assert(AddrSpace == LangAS::sycl_global ||
-           AddrSpace == LangAS::sycl_global_device ||
-           AddrSpace == LangAS::sycl_global_host ||
-           AddrSpace == LangAS::opencl_constant ||
-           AddrSpace == LangAS::sycl_local ||
-           AddrSpace == LangAS::sycl_private ||
-           AddrSpace >= LangAS::FirstTargetAddressSpace);
-    return AddrSpace;
-  }
+  if (LangOpts.SYCLIsDevice &&
+      (!D || D->getType().getAddressSpace() == LangAS::Default))
+    return LangAS::sycl_global;
 
   if (LangOpts.CUDA && LangOpts.CUDAIsDevice) {
     if (D && D->hasAttr<CUDAConstantAttr>())

clang/lib/CodeGen/TargetInfo.cpp

@@ -460,7 +460,6 @@ LangAS TargetCodeGenInfo::getGlobalVarAddressSpace(CodeGenModule &CGM,
                                                    const VarDecl *D) const {
   assert(!CGM.getLangOpts().OpenCL &&
          !(CGM.getLangOpts().CUDA && CGM.getLangOpts().CUDAIsDevice) &&
-         !(CGM.getLangOpts().SYCLIsDevice) &&
          "Address space agnostic languages only");
   return D ? D->getType().getAddressSpace() : LangAS::Default;
 }
@@ -9168,7 +9167,6 @@ AMDGPUTargetCodeGenInfo::getGlobalVarAddressSpace(CodeGenModule &CGM,
                                                   const VarDecl *D) const {
   assert(!CGM.getLangOpts().OpenCL &&
          !(CGM.getLangOpts().CUDA && CGM.getLangOpts().CUDAIsDevice) &&
-         !(CGM.getLangOpts().SYCLIsDevice) &&
          "Address space agnostic languages only");
   LangAS DefaultGlobalAS = getLangASFromTargetAS(
       CGM.getContext().getTargetAddressSpace(LangAS::opencl_global));