Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: src/IceInst.h

Issue 773583004: Subzero: Fix the g++ build (e.g. Windows). (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/IceInst.h
diff --git a/src/IceInst.h b/src/IceInst.h
index 16b1b65027000bb9f977453523d3c1f744463572..15751d3da0a0336e8b9d7359508f6b23d4efc41a 100644
--- a/src/IceInst.h
+++ b/src/IceInst.h
@@ -128,8 +128,17 @@ public:
// result in any native instructions, and a target-specific
// instruction results in a single native instruction.
virtual uint32_t getEmitInstCount() const { return 0; }
- virtual void emit(const Cfg *Func) const = 0;
- virtual void emitIAS(const Cfg *Func) const = 0;
+ // TODO(stichnot): Change Inst back to abstract once the g++ build
+ // issue is fixed. llvm::ilist<Ice::Inst> doesn't work under g++
+ // because the resize(size_t, Ice::Inst) method is incorrectly
+ // declared and thus doesn't allow the abstract class Ice::Inst.
+ // The method should be declared resize(size_t, const Ice::Inst &).
+ // virtual void emit(const Cfg *Func) const = 0;
+ // virtual void emitIAS(const Cfg *Func) const = 0;
+ virtual void emit(const Cfg *) const {
+ llvm_unreachable("emit on abstract class");
+ }
+ virtual void emitIAS(const Cfg *Func) const { emit(Func); }
virtual void dump(const Cfg *Func) const;
virtual void dumpExtras(const Cfg *Func) const;
void dumpDecorated(const Cfg *Func) const;
@@ -835,11 +844,12 @@ protected:
} // end of namespace Ice
+namespace llvm {
+
// Override the default ilist traits so that Inst's private ctor and
// deleted dtor aren't invoked.
template <>
-struct llvm::ilist_traits<Ice::Inst>
- : public llvm::ilist_default_traits<Ice::Inst> {
+struct ilist_traits<Ice::Inst> : public ilist_default_traits<Ice::Inst> {
Ice::Inst *createSentinel() const {
return static_cast<Ice::Inst *>(&Sentinel);
}
@@ -853,4 +863,6 @@ private:
mutable ilist_half_node<Ice::Inst> Sentinel;
};
+} // end of namespace llvm
+
#endif // SUBZERO_SRC_ICEINST_H
« no previous file with comments | « src/IceGlobalContext.cpp ('k') | src/IceOperand.cpp » ('j') | src/IceOperand.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698