Extract the SPIR_GENERIC_AS constant

Author: Pavel Samolysov

clang/include/clang/Basic/Targets/SPIR.h

@@ -0,0 +1,19 @@
+//===---- SPIR.h - Declare SPIR and SPIR-V target interfaces ----*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+namespace clang {
+namespace targets {
+
+// Used by both the SPIR and SPIR-V targets. Code of the generic address space
+// for the target
+constexpr unsigned SPIR_GENERIC_AS = 4u;
+
+} // namespace targets
+} // namespace clang

clang/lib/CodeGen/BackendUtil.cpp

@@ -11,6 +11,7 @@
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/TargetOptions.h"
+#include "clang/Basic/Targets/SPIR.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
 #include "clang/Frontend/Utils.h"
 #include "clang/Lex/HeaderSearchOptions.h"
@@ -1072,7 +1073,7 @@ void EmitAssemblyHelper::EmitAssemblyWithLegacyPassManager(
     if (TargetTriple.isSPIR() || TargetTriple.isSPIRV()) {
       // This function pass should run after inlining, so it is added to MPM
       PerModulePasses.add(
-          createInferAddressSpacesPass((4))); // TODO make/use the constant
+          createInferAddressSpacesPass(targets::SPIR_GENERIC_AS));
     }
   }