Revert "Force __pnacl_pso_root to be an external declaration."

src/IceGlobalInits.h

 //===- subzero/src/IceGlobalInits.h - Global declarations -------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 84 matching lines @@
   /// that relocations across pnacl-sz and pnacl-llc will work).
   virtual IceString mangleName(GlobalContext *Ctx) const {
     return getSuppressMangling() ? Name : Ctx->mangleName(Name);
   }
 
   /// Returns textual name of linkage.
   const char *getLinkageName() const {
     return isInternal() ? "internal" : "external";
   }
 
-  /// Returns true if the name of this GlobalDeclaration indicates that it
-  /// should have ExternalLinkage (as a special case).
-  virtual bool isPNaClABIExternalName() const = 0;
-
 protected:
   GlobalDeclaration(GlobalDeclarationKind Kind,
                     llvm::GlobalValue::LinkageTypes Linkage)
       : Kind(Kind), Linkage(Linkage) {}
 
   /// Returns true if linkage is defined correctly for the global declaration,
   /// based on default rules.
   bool verifyLinkageDefault(const GlobalContext *Ctx) const {
     switch (Linkage) {
     default:
@@ skipping 32 matching lines @@
   bool isProto() const { return IsProto; }
   static bool classof(const GlobalDeclaration *Addr) {
     return Addr->getKind() == FunctionDeclarationKind;
   }
   void dumpType(Ostream &Stream) const final;
   void dump(GlobalContext *Ctx, Ostream &Stream) const final;
   bool getSuppressMangling() const final { return isExternal() && IsProto; }
 
   /// Returns true if linkage is correct for the function declaration.
   bool verifyLinkageCorrect(const GlobalContext *Ctx) const {
-    if (isIntrinsicName(Ctx))
+    if (isPNaClABIExternalName() || isIntrinsicName(Ctx))
       return Linkage == llvm::GlobalValue::ExternalLinkage;
-    else if (Linkage == llvm::GlobalValue::ExternalLinkage)
-      return isPNaClABIExternalName();
-    else
-      return verifyLinkageDefault(Ctx);
+    return verifyLinkageDefault(Ctx);
   }
 
   /// Validates that the type signature of the function is correct. Returns true
   /// if valid.
   bool validateTypeSignature(const GlobalContext *Ctx) const {
     bool IsIntrinsic;
     if (const Intrinsics::FullIntrinsicInfo *Info =
             getIntrinsicInfo(Ctx, &IsIntrinsic))
       return validateIntrinsicTypeSignature(Info);
     return !IsIntrinsic && validateRegularTypeSignature();
@@ skipping 19 matching lines @@
   const Ice::FuncSigType Signature;
   llvm::CallingConv::ID CallingConv;
   bool IsProto;
 
   FunctionDeclaration(const FuncSigType &Signature,
                       llvm::CallingConv::ID CallingConv,
                       llvm::GlobalValue::LinkageTypes Linkage, bool IsProto)
       : GlobalDeclaration(FunctionDeclarationKind, Linkage),
         Signature(Signature), CallingConv(CallingConv), IsProto(IsProto) {}
 
-  bool isPNaClABIExternalName() const override {
-    static constexpr char Start[] = "_start";
-    return getName() == Start;
+  bool isPNaClABIExternalName() const {
+    const char *Name = getName().c_str();
+    return strcmp(Name, "_start") == 0 || strcmp(Name, "__pnacl_pso_root") == 0;
   }
 
   bool isIntrinsicName(const GlobalContext *Ctx) const {
     bool IsIntrinsic;
     getIntrinsicInfo(Ctx, &IsIntrinsic);
     return IsIntrinsic;
   }
 
   bool validateRegularTypeSignature() const;
 
@@ skipping 197 matching lines @@
 
   /// Prints out type for initializer associated with the declaration to Stream.
   void dumpType(Ostream &Stream) const final;
 
   /// Prints out the definition of the global variable declaration (including
   /// initialization).
   void dump(GlobalContext *Ctx, Ostream &Stream) const final;
 
   /// Returns true if linkage is correct for the variable declaration.
   bool verifyLinkageCorrect(const GlobalContext *Ctx) const {
-    if (isPNaClABIExternalName()) {
-      return Linkage == llvm::GlobalValue::ExternalLinkage;
-    }
     return verifyLinkageDefault(Ctx);
   }
 
   static bool classof(const GlobalDeclaration *Addr) {
     return Addr->getKind() == VariableDeclarationKind;
   }
 
   bool getSuppressMangling() const final {
     if (ForceSuppressMangling)
       return true;
     return isExternal() && !hasInitializer();
   }
 
   void setSuppressMangling() { ForceSuppressMangling = true; }
 
   void discardInitializers() { Initializers = nullptr; }
 
-  bool isPNaClABIExternalName() const override {
-    static constexpr char PnaclPsoRoot[] = "__pnacl_pso_root";
-    return getName() == PnaclPsoRoot;
-  }
-
 private:
   /// List of initializers for the declared variable.
   std::unique_ptr<InitializerListType> Initializers;
   bool HasInitializer;
   /// The alignment of the declared variable.
   uint32_t Alignment;
   /// True if a declared (global) constant.
   bool IsConstant;
   /// If set to true, force getSuppressMangling() to return true.
   bool ForceSuppressMangling;
@@ skipping 15 matching lines @@
 template <class StreamType>
 inline StreamType &operator<<(StreamType &Stream,
                               const GlobalDeclaration &Addr) {
   Addr.dump(Stream);
   return Stream;
 }
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEGLOBALINITS_H