Remove trampolines and all of the associated creaky machinery

include/clang/AST/DeclCXX.h

@@ -986,9 +986,6 @@ class CXXRecordDecl : public RecordDecl {
 #endif
   }
 
-  /// Returns the deserialization constructor for this class.
-  CXXMethodDecl *getCXXAMPDeserializationConstructor() const;
-
   /// Determine whether this class has any user-declared constructors.
   ///
   /// When true, a default constructor will not be implicitly declared.

include/clang/AST/Type.h

@@ -2367,7 +2367,7 @@ class Type : public ExtQualsTypeCommonBase {
   friend class ASTReader;
   friend class ASTWriter;
 
-  /// \brief True if object is of hc::array or Concurrency:type
+  /// \brief True if object is of hc::array.
   bool isGPUArrayType() const;
 };
 

include/clang/Basic/Attr.td

@@ -3157,17 +3157,12 @@ def InternalLinkage : InheritableAttr {
 
 // C++AMP attributes
 
-def CXXAMPRestrictAMP : InheritableAttr {
-  let Spellings = [GNU<"amp">, GNU<"hc">];
+def HCRestrictHC : InheritableAttr {
+  let Spellings = [GNU<"hc">];
   let Documentation = [Undocumented];
 }
 
-def CXXAMPRestrictAUTO : InheritableAttr {
-  let Spellings = [GNU<"auto">];
-  let Documentation = [Undocumented];
-}
-
-def CXXAMPRestrictCPU : InheritableAttr {
+def HCRestrictCPU : InheritableAttr {
   let Spellings = [GNU<"cpu">];
   let Documentation = [Undocumented];
 }

include/clang/Basic/CodeGenOptions.def

@@ -42,8 +42,7 @@ CODEGENOPT(ControlFlowGuard  , 1, 0) ///< -cfguard
 CODEGENOPT(CoverageExtraChecksum, 1, 0) ///< Whether we need a second checksum for functions in GCNO files.
 CODEGENOPT(CoverageNoFunctionNamesInData, 1, 0) ///< Do not include function names in GCDA files.
 CODEGENOPT(CoverageExitBlockBeforeBody, 1, 0) ///< Whether to emit the exit block before the body blocks in GCNO files.
-CODEGENOPT(AMPIsDevice       , 1, 0) ///< Set when compiling for C++AMP kernels.
-CODEGENOPT(AMPCPU            , 1, 0) ///< Set when compiling for C++AMP kernels on CPU.
+CODEGENOPT(HCIsDevice        , 1, 0) ///< Set when compiling for HC kernels.
 CODEGENOPT(CXAAtExit         , 1, 1) ///< Use __cxa_atexit for calling destructors.
 CODEGENOPT(RegisterGlobalDtorsWithAtExit, 1, 1) ///< Use atexit or __cxa_atexit to register global destructors.
 CODEGENOPT(CXXCtorDtorAliases, 1, 0) ///< Emit complete ctors/dtors as linker

include/clang/Basic/DiagnosticSemaKinds.td

@@ -8672,7 +8672,7 @@ def err_amp_bad_reinterpret_cast_from_pointer_to_functionptr : Error<
 def err_amp_memory_operation : Error<
 "operator is not supported in amp-compatible codes'">;
 def err_amp_unsupported_reference_or_pointer : Error<
-"pointer or reference is not allowed as pointed to type, array element type or data member type (except reference to concurrency::array/texture)">;
+"pointer or reference is not allowed as pointed to type, array element type or data member type (except reference to hc::array/texture)">;
 def err_amp_incompatible : Error<
 "the field type is not amp-compatible">;
 def err_amp_type_unsupported : Error<
@@ -8706,7 +8706,7 @@ def err_amp_call_from_cpu_to_amp : Error<
 def err_amp_call_from_amp_to_cpu : Error<
 "call from AMP-restricted function to CPU-restricted function">;
 def err_amp_call_from_both_amp_and_cpu_to_disctint : Error<
-"call from both amp and cpu restricted function to disctint restricted function">;
+"call from both amp and cpu restricted function to distinct restricted function">;
 def err_amp_need_4_byte_aligned : Error<
 "variables in AMP-restricted function shall be 4-bytes aligned">;
 def err_amp_captured_variable_type : Error<

include/clang/Basic/LangOptions.def

@@ -218,10 +218,7 @@ LANGOPT(GPURelocatableDeviceCode, 1, 0, "generate relocatable device code")
 
 LANGOPT(CPlusPlusAMP      , 1, 0, "C++AMP")
 LANGOPT(DevicePath        , 1, 0, "C++AMP Device Path")
-LANGOPT(AMPCPU            , 1, 0, "C++AMP CPU Path")
 LANGOPT(HSAExtension      , 1, 0, "C++AMP Extension for HSA")
-LANGOPT(AutoAuto          , 1, 0, "Enable auto-auto")
-LANGOPT(AutoCompileForAccelerator, 1, 0, "Enable auto-compile-for-accelerator")
 
 LANGOPT(SizedDeallocation , 1, 0, "sized deallocation")
 LANGOPT(AlignedAllocation , 1, 0, "aligned allocation")

include/clang/Basic/Specifiers.h

@@ -331,8 +331,7 @@ namespace clang {
   enum CPPAMPSpecifier {
     CPPAMP_None = 0x0,
     CPPAMP_CPU  = 0x1,
-    CPPAMP_AMP  = 0x2,
-    CPPAMP_AUTO = 0x4
+    CPPAMP_AMP  = 0x2
   };
 } // end namespace clang
 

include/clang/Basic/Version.inc.in

@@ -7,7 +7,7 @@
 #define HCC_VERSION_STRING "@HCC_VERSION_STRING@"
 #define HCC_VERSION_MAJOR @HCC_VERSION_MAJOR@
 #define HCC_VERSION_MINOR @HCC_VERSION_MINOR@
-#define HCC_VERSION_PATCH "@HCC_VERSION_PATCH@-@KALMAR_SDK_COMMIT@-@KALMAR_FRONTEND_COMMIT@-@KALMAR_BACKEND_COMMIT@"
+#define HCC_VERSION_PATCH "@HCC_VERSION_PATCH@-@HC_SDK_COMMIT@-@HC_FRONTEND_COMMIT@-@HC_BACKEND_COMMIT@"
 #define HCC_VERSION_WORKWEEK @HCC_VERSION_PATCH@
 
-#define KALMAR_BACKEND @KALMAR_BACKEND@
+#define HC_BACKEND @HC_BACKEND@

include/clang/Driver/CC1Options.td

@@ -842,21 +842,9 @@ def fopenmp_host_ir_file_path : Separate<["-"], "fopenmp-host-ir-file-path">,
 def famp_is_device : Flag<["-"], "famp-is-device">,
   HelpText<"Generate code for AMP kernels">;
 
-def famp_cpu : Flag<["-"], "famp-cpu">,
-  HelpText<"Generate code for AMP CPU kernels">;
-
 def fhsa_extension : Flag<["-"], "fhsa-ext">,
   HelpText<"Enable HSA-specific rules for C++AMP kernels">;
 
-def fno_auto_auto : Flag<["-"], "fno-auto-auto">,
-  HelpText<"Disable auto-auto feature (Obsolete, use -fauto-auto to explicit enable it instead)">;
-
-def fauto_auto : Flag<["-"], "fauto-auto">,
-  HelpText<"Enable auto-auto feature">;
-
-def fauto_compile_for_accelerator : Flag<["-"], "fauto-compile-for-accelerator">,
-  HelpText<"Enable auto-compile-for-accelerator feature">;
-
 } // let Flags = [CC1Option]
 
 //===----------------------------------------------------------------------===//

include/clang/Frontend/FrontendOptions.h

@@ -156,7 +156,7 @@ class InputKind {
     ///@{ Languages that the frontend can parse and compile.
     C,
     CXX,
-	CXXAMP,
+	  CXXAMP,
 
     ObjC,
     ObjCXX,

include/clang/Parse/Parser.h

@@ -718,9 +718,9 @@ class Parser : public CodeCompletionHandler {
     return PP.LookAhead(N-1);
   }
 
-  /// C++ AMP-specific
-  /// check if the given scope is AMP-restricted
-  bool IsInAMPFunction(Scope *);
+  /// HC-specific
+  /// check if the given scope is [[hc]]
+  bool IsInHCFunction(Scope *);
 
 public:
   /// NextToken - This peeks ahead one token and returns it without
@@ -1414,9 +1414,6 @@ class Parser : public CodeCompletionHandler {
                             bool StopAtSemi = true,
                             bool ConsumeFinalToken = true);
 
-  // C++AMP
-  bool CXXAMPFindRestrictionSeq(CachedTokens &Toks, bool ConsumeFinalToken);
-
   //===--------------------------------------------------------------------===//
   // C99 6.9: External Definitions.
   struct ParsedAttributesWithRange : ParsedAttributes {
@@ -2653,11 +2650,6 @@ class Parser : public CodeCompletionHandler {
   void ParseBracketDeclarator(Declarator &D);
   void ParseMisplacedBracketDeclarator(Declarator &D);
 
-  // C++AMP
-  unsigned ParseRestrictionSpecification(Declarator &D,
-                                         ParsedAttributes &Attrs,
-                                         SourceLocation &DeclEndLoc);
-
   //===--------------------------------------------------------------------===//
   // C++ 7: Declarations [dcl.dcl]
 

include/clang/Sema/Scope.h

@@ -202,8 +202,8 @@ class Scope {
   /// Used to determine if errors occurred in this scope.
   DiagnosticErrorTrap ErrorTrap;
 
-  /// C++AMP restriction specifier
-  unsigned short CXXAMPSpecifier;
+  /// HC restriction specifier
+  unsigned short HCSpecifier;
 
   /// A lattice consisting of undefined, a single NRVO candidate variable in
   /// this scope, or over-defined. The bit is true when over-defined.
@@ -386,24 +386,20 @@ class Scope {
     return getFlags() & Scope::FunctionPrototypeScope;
   }
 
-  /// \brief C++AMP restriction specifiers
-  enum CPPAMPSpecifier {
-    CPPAMP_None = 0x0,
-    CPPAMP_CPU  = 0x1,
-    CPPAMP_AMP  = 0x2,
-    CPPAMP_AUTO = 0x4
+  /// \brief HC restriction specifiers
+  enum HCSpecifier {
+    HC_None = 0x0,
+    HC_CPU  = 0x1,
+    HC_HC  = 0x2
   };
-  void setCXXAMPSpecifier(unsigned A) { CXXAMPSpecifier = A; }
-  void setAMPScope() { CXXAMPSpecifier |= CPPAMP_AMP; }
-  void setCPUScope() { CXXAMPSpecifier |= CPPAMP_CPU; }
-  bool isAMPScope() const {
-    return CXXAMPSpecifier & CPPAMP_AMP;
+  void setHCSpecifier(unsigned A) { HCSpecifier = A; }
+  void setHCScope() { HCSpecifier |= HC_HC; }
+  void setCPUScope() { HCSpecifier |= HC_CPU; }
+  bool isHCScope() const {
+    return HCSpecifier & HC_HC;
   }
   bool isCPUScope() const {
-    return CXXAMPSpecifier & CPPAMP_CPU;
-  }
-  bool isAUTOScope() const {
-    return CXXAMPSpecifier & CPPAMP_AUTO;
+    return HCSpecifier & HC_CPU;
   }
 
   /// isAtCatchScope - Return true if this scope is \@catch.

include/clang/Sema/Sema.h

@@ -1864,9 +1864,9 @@ class Sema {
                std::unique_ptr<CorrectionCandidateCallback> CCC = nullptr);
 
   // C++AMP declarator diagnostic functions
-  bool DiagnoseCXXAMPDecl(Decl* Dcl, bool CheckContainer = false, bool IsInfer = false);
-  bool IsCXXAMPTileStatic(Declarator &D);
-  void DiagnosticCXXAMPTileStatic(Declarator &D, Decl *Dcl);
+  bool DiagnoseHCDecl(Decl* Dcl, bool CheckContainer = false, bool IsInfer = false);
+  bool IsHCTileStatic(Declarator &D);
+  void DiagnosticHCTileStatic(Declarator &D, Decl *Dcl);
 
   /// Describes the detailed kind of a template name. Used in diagnostics.
   enum class TemplateNameKindForDiagnostics {
@@ -2070,9 +2070,6 @@ class Sema {
   /// \c constexpr in C++11 or has an 'auto' return type in C++14).
   bool canSkipFunctionBody(Decl *D);
 
-  // C++AMP restriction specifier inferring routine
-  void TryCXXAMPRestrictionInferring(Decl *D, Stmt *Body);
-
   void computeNRVO(Stmt *Body, sema::FunctionScopeInfo *Scope);
   Decl *ActOnFinishFunctionBody(Decl *Decl, Stmt *Body);
   Decl *ActOnFinishFunctionBody(Decl *Decl, Stmt *Body, bool IsInstantiation);
@@ -2552,9 +2549,8 @@ class Sema {
     Ovl_NonFunction
   };
 
-  // C++AMP diagnostic routine on destructor overload resolution
-  void DiagnoseCXXAMPDtorOverload(FunctionDecl *New,
-                           const LookupResult &Old);
+  // HC diagnostic routine on destructor overload resolution
+  void DiagnoseHCDtorOverload(FunctionDecl *New, const LookupResult &Old);
 
   OverloadKind CheckOverload(Scope *S,
                              FunctionDecl *New,
@@ -2861,12 +2857,11 @@ class Sema {
                                             OverloadCandidateSet& CandidateSet,
                                             bool PartialOverloading = false);
 
-  // C++AMP restriction specifier scope checking routines
-  bool IsInAMPRestricted();
+  // HC restriction specifier scope checking routines
+  bool IsInHCRestricted();
   // Determine if in CPU and/or AMP restricted codes
   bool IsInAnyExplicitRestricted();
-  void GetCXXAMPParentRestriction(Scope* SC, bool& ParentCPU,
-    bool& ParentAMP, bool&ParentAUTO);
+  void GetHCParentRestriction(Scope *SC, bool &ParentCPU, bool &ParentHC);
 
   // Emit as a 'note' the specific overload candidate
   void NoteOverloadCandidate(NamedDecl *Found, FunctionDecl *Fn,
@@ -2981,8 +2976,8 @@ class Sema {
                                            Expr *Range, ExprResult *CallExpr);
 
   // C++AMP diagnostic routine on overloaded call expressions
-  void DiagnoseCXXAMPOverloadedCallExpr(SourceLocation LParenLoc,
-                                        FunctionDecl* Callee);
+  void DiagnoseHCOverloadedCallExpr(SourceLocation LParenLoc,
+                                    FunctionDecl* Callee);
 
   ExprResult BuildOverloadedCallExpr(Scope *S, Expr *Fn,
                                      UnresolvedLookupExpr *ULE,
@@ -3175,15 +3170,16 @@ class Sema {
   typedef std::function<ExprResult(Sema &, TypoExpr *, TypoCorrection)>
       TypoRecoveryCallback;
 
-  // C++AMP type checking routine for kernel codes
+  // TODO: Fix for winter cleanup.
+  // HC type checking routine for kernel codes
 public:
   bool IsIncompatibleType(const Type* Ty, bool CheckContainer = false, bool IsInfer = false);
 
 private:
-  // C++AMP type checking routine for kernel codes
-  bool IsCXXAMPUnsupportedPointerType(const Type* Ty,
+  // HC type checking routine for kernel codes
+  bool IsHCUnsupportedPointerType(const Type *Ty,
     bool CheckContainer = false, bool IsInfer = false);
-  bool IsCXXAMPUnsupportedReferenceType(const Type* Ty,
+  bool IsHCUnsupportedReferenceType(const Type* Ty,
     bool CheckContainer = false, bool IsInfer = false);
 
   bool CppLookupName(LookupResult &R, Scope *S);
@@ -4419,9 +4415,9 @@ class Sema {
                                 ParmVarDecl *Param,
                                 const Expr *ArgExpr);
 
-  // C++AMP diagnotic routine on C++ method call expressions
-  void DiagnoseCXXAMPMethodCallExpr(SourceLocation LParenLoc,
-                                    CXXMethodDecl *Callee);
+  // HC diagnotic routine on C++ method call expressions
+  void DiagnoseHCMethodCallExpr(SourceLocation LParenLoc,
+                                CXXMethodDecl *Callee);
 
   /// ActOnCallExpr - Handle a call to Fn with the specified array of arguments.
   /// This provides the location of the left/right parens and a list of comma
@@ -5014,22 +5010,6 @@ class Sema {
   void DefineImplicitCopyAssignment(SourceLocation CurrentLocation,
                                     CXXMethodDecl *MethodDecl);
 
-  /// Defines an AMP CUP-side serialize function.
-  void DefineAmpCpuSerializeFunction(SourceLocation CurrentLocation,
-                                     CXXMethodDecl *MethodDecl);
-  /// Defines an AMP GPU-side deserialize function.
-  void DefineAmpGpuDeSerializeFunction(SourceLocation CurrentLocation,
-                                       CXXMethodDecl *MethodDecl);
-  /// Declare trampoline name lookup code for AMP CPU-side
-  void DeclareAMPTrampolineName(CXXRecordDecl *ClassDecl,
-                                DeclarationName Name);
-  /// Declare trampoline code for AMP GPU-side entry
-  void DeclareAMPTrampoline(CXXRecordDecl *ClassDecl,
-                            DeclarationName Name);
-  /// Define trampoline code for AMP GPU-side entry
-  void DefineAMPTrampoline(SourceLocation CurrentLocation,
-                           CXXMethodDecl *OperatorCall);
-
   /// Declare the implicit move assignment operator for the given class.
   ///
   /// \param ClassDecl The Class declaration into which the implicit
@@ -5941,19 +5921,6 @@ class Sema {
   /// \returns true if any work was done, false otherwise.
   bool DefineUsedVTables();
 
-  /// \brief Test if a given class requires a
-  /// C++AMP deserializer declaration
-  bool NeedAMPDeserializer(CXXRecordDecl *ClassDecl);
-  /// \brief Test if a given class has a C++AMP deserializer declaration
-  bool HasDeclaredAMPDeserializer(CXXRecordDecl *ClassDecl);
-
-  // Declare C++AMP serializer and deserializer
-  typedef SmallVector<QualType, 16> AMPDeserializerArgs;
-  void DeclareAMPSerializer(CXXRecordDecl *ClassDecl,
-                            DeclarationName Name);
-  void DeclareAMPDeserializer(CXXRecordDecl *ClassDecl,
-                              AMPDeserializerArgs *Args);
-
   void AddImplicitlyDeclaredMembersToClass(CXXRecordDecl *ClassDecl);
 
   void ActOnMemInitializers(Decl *ConstructorDecl,
@@ -6487,10 +6454,10 @@ class Sema {
   };
 
   // C++AMP diagnotic routine for template arguments
-  void DiagnoseCXXAMPTemplateArgument(NamedDecl *Param,
-                                      const TemplateArgumentLoc &AL,
-                                      NamedDecl *Template,
-                                      SourceLocation TemplateLoc);
+  void DiagnoseHCTemplateArgument(NamedDecl *Param,
+                                  const TemplateArgumentLoc &AL,
+                                  NamedDecl *Template,
+                                  SourceLocation TemplateLoc);
 
   bool CheckTemplateArgument(NamedDecl *Param,
                              TemplateArgumentLoc &Arg,
@@ -9668,8 +9635,9 @@ class Sema {
     Incompatible
   };
 
-  // C++AMP diagnostic routine for expressions
-  void DiagnoseCXXAMPExpr(Expr* Stripped, ExprResult &HS, bool DiagnoseWhenStatic=false);
+  // HC diagnostic routine for expressions
+  void DiagnoseHCExpr(Expr *Stripped,
+                      ExprResult &HS, bool DiagnoseWhenStatic = false);
 
   /// DiagnoseAssignmentResult - Emit a diagnostic, if required, for the
   /// assignment conversion type specified by ConvTy.  This returns true if the