Bug 910807 - IonMonkey: Change Nobe to Node, to fix inconsistencies, both with the places that still said "beta node", and with the widely-used phrase "phi node". r=nbp

js/src/jit/Ion.cpp

@@ -1304,7 +1304,7 @@ OptimizeMIR(MIRGenerator *mir)
 
     if (js_IonOptions.rangeAnalysis) {
         RangeAnalysis r(mir, graph);
-        if (!r.addBetaNobes())
+        if (!r.addBetaNodes())
             return false;
         IonSpewPass("Beta");
         AssertExtendedGraphCoherency(graph);
@@ -1320,7 +1320,7 @@ OptimizeMIR(MIRGenerator *mir)
         if (mir->shouldCancel("Range Analysis"))
             return false;
 
-        if (!r.removeBetaNobes())
+        if (!r.removeBetaNodes())
             return false;
         IonSpewPass("De-Beta");
         AssertExtendedGraphCoherency(graph);

js/src/jit/RangeAnalysis.cpp

@@ -124,9 +124,9 @@ RangeAnalysis::replaceDominatedUsesWith(MDefinition *orig, MDefinition *dom,
 }
 
 bool
-RangeAnalysis::addBetaNobes()
+RangeAnalysis::addBetaNodes()
 {
-    IonSpew(IonSpew_Range, "Adding beta nobes");
+    IonSpew(IonSpew_Range, "Adding beta nodes");
 
     for (PostorderIterator i(graph_.poBegin()); i != graph_.poEnd(); i++) {
         MBasicBlock *block = *i;
@@ -230,9 +230,9 @@ RangeAnalysis::addBetaNobes()
 }
 
 bool
-RangeAnalysis::removeBetaNobes()
+RangeAnalysis::removeBetaNodes()
 {
-    IonSpew(IonSpew_Range, "Removing beta nobes");
+    IonSpew(IonSpew_Range, "Removing beta nodes");
 
     for (PostorderIterator i(graph_.poBegin()); i != graph_.poEnd(); i++) {
         MBasicBlock *block = *i;

js/src/jit/RangeAnalysis.h

@@ -80,10 +80,10 @@ class RangeAnalysis
   public:
     MOZ_CONSTEXPR RangeAnalysis(MIRGenerator *mir, MIRGraph &graph) :
         mir(mir), graph_(graph) {}
-    bool addBetaNobes();
+    bool addBetaNodes();
     bool analyze();
     bool addRangeAssertions();
-    bool removeBetaNobes();
+    bool removeBetaNodes();
     bool truncate();
 
   private: