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/IceAssemblerX86Base.h

Issue 1265023003: Clarify which type "Label" refers to (generic vs X86) (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: simplify the get Created 5 years, 5 months 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/IceAssemblerX86Base.h
diff --git a/src/IceAssemblerX86Base.h b/src/IceAssemblerX86Base.h
index 252903ee25078bcb1eea2670d1b3c6429634041c..9edf501dbcb6111f1b958e6e1717b4bc7b4d31ed 100644
--- a/src/IceAssemblerX86Base.h
+++ b/src/IceAssemblerX86Base.h
@@ -72,7 +72,7 @@ private:
};
/// X86 allows near and far jumps.
-class Label final : public Ice::Label {
+class Label final : public LabelBase {
Label(const Label &) = delete;
Label &operator=(const Label &) = delete;
@@ -81,7 +81,7 @@ public:
~Label() = default;
void finalCheck() const override {
- Ice::Label::finalCheck();
+ Ice::LabelBase::finalCheck();
assert(!hasNear());
}
@@ -96,7 +96,7 @@ public:
bool hasNear() const { return !UnresolvedNearPositions.empty(); }
bool isUnused() const override {
- return Ice::Label::isUnused() && !hasNear();
+ return Ice::LabelBase::isUnused() && !hasNear();
}
private:
@@ -150,8 +150,9 @@ public:
nop(Padding);
}
- Label *getOrCreateCfgNodeLabel(SizeT NodeNumber) override;
+ LabelBase *getCfgNodeLabel(SizeT NodeNumber) override;
void bindCfgNodeLabel(SizeT NodeNumber) override;
+ Label *getOrCreateCfgNodeLabel(SizeT Number);
Label *getOrCreateLocalLabel(SizeT Number);
void bindLocalLabel(SizeT Number);
« src/IceAssembler.h ('K') | « src/IceAssemblerX8632.h ('k') | src/IceAssemblerX86BaseImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698