Changeset 1034

Timestamp:

02/11/10 11:18:34 (6 months ago)

Author:

corni

Message:

Replace the friend-relationship between stmt and CheckMemoryManagement?.
Auto-add CheckMemoryManagement? in debug builds after each pass.
Add a pass for return; => return NULL; transformations
Add a cli argument to rphp-analyzer (--lower) which runs all existing passes in a well-defined order.
pPassManager shouldn't have a copy constructor (per comment) so remove the existing empty.
Document which phc pass has been implemented in which corresponding rphp pass.

Location:

trunk/rphp

Files:

• compiler/analysis/CMakeLists.txt (modified) (1 diff)
• compiler/analysis/pPassManager.cpp (modified) (2 diffs)
• compiler/analysis/passes/CheckMemoryManagement.cpp (modified) (1 diff)
• compiler/analysis/passes/Desugar.cpp (added)
• compiler/analysis/passes/Lower_Binary_Op.cpp (modified) (1 diff)
• doc/phc-pass-notes.txt (modified) (2 diffs)
• frontend/cli/rphp-analyzer.cpp (modified) (4 diffs)
• include/rphp/analysis/pAST.h (modified) (5 diffs)
• include/rphp/analysis/pPassManager.h (modified) (2 diffs)
• include/rphp/analysis/passes/Desugar.h (added)

trunk/rphp/compiler/analysis/CMakeLists.txt

@@ -84 +84 @@
   passes/CheckMemoryManagement.cpp
   passes/SimplifyStrings.cpp
+  passes/Desugar.cpp
   passes/DumpAST.cpp
   passes/DumpStats.cpp

trunk/rphp/compiler/analysis/pPassManager.cpp

@@ -23 +23 @@
 #include "rphp/analysis/pPass.h"
 #include "rphp/analysis/pSourceModule.h"
+#include "rphp/analysis/passes/CheckMemoryManagement.h"
 
 namespace rphp {
@@ -46 +47 @@
         (*i)->post_run();
     }
+}
 
+void pPassManager::addPass(AST::pPass* p) {
+    passQueue_.push_back(p);
+#ifdef DEBUG
+    passQueue_.push_back(new AST::Pass::CheckMemoryManagement);
+#endif
 }
 

trunk/rphp/compiler/analysis/passes/CheckMemoryManagement.cpp

@@ -30 +30 @@
 
 void CheckMemoryManagement::visit_pre_stmt(stmt* s) {
-    if(s && s->refCount_ != 1) {
-        std::cerr << "The following AST Node has a refCount of " << s->refCount_ << std::endl; 
+    if(s && s->getRefCount() != 1) {
+        std::cerr << "The following AST Node has a refCount of " << s->getRefCount() << std::endl; 
         DumpAST dump(module_);
         dump.pre_run();

trunk/rphp/compiler/analysis/passes/Lower_Binary_Op.cpp

@@ -97 +97 @@
         case binaryOp::GREATER_OR_EQUAL:
         case binaryOp::GREATER_THAN:
+            //TODO: file+line numbers?
             return new (C_) binaryOp(n->rVal()->retain(),
                              n->lVal()->retain(),

trunk/rphp/doc/phc-pass-notes.txt

@@ -10 +10 @@
 Constant_folding: a) we don't have a match() function in rphp b) We don't call to zend php for folding constant expressions
 Remove_concat_null: Our parser shouldn't create these concats, so this issue is phc specific.
-Desugar: - and/or renaming to && and || happens already in our parser
+Desugar *implemented Desugar* : - and/or renaming to && and || happens already in our parser
                         - we don't have classes yet (no need to replace self:: and parent:: yet)
                         - same for interfaces
                         - we don't store cast types as strings but as enum, so we don't have to normalize them.
-                        - we already generate the same AST for return; and return NULL;
+                        - we need this to replace return; with return NULL;
                         - i'm unsure whether we want to transform - x to 0 - x
 Split_multiple_arguments: We got a better facility to iterate over children nodes, so we don't need this imho.
-Split_unset_isset: this one makes more sense, but we need a facility to return an expression list first (sth block-like)
-Echo_split: we definitly want this for the reason given in Echo_split.cpp, but see S-u-i...
-Early_lower_control_flow: we want this at least partially because it simplifies loop codegen later on, but we've to be
+Split_unset_isset *implemented Split_Builtins*: this one makes more sense, but we need a facility to return an expression list first (sth block-like)
+Echo_split *implemented Split_Builtins*: we definitly want this for the reason given in Echo_split.cpp, but see S-u-i...
+Early_lower_control_flow *implemented Early_lower_control_flow except switch and foreach!*: we want this at least partially because it simplifies loop codegen later on, but we've to be
                                                          super careful with continue. Probably the transformations by phc can be used, but we want to
                                                          sure they are optimized later if the loop body doesn't contain a continue;.
-Lower_expr_flow: We want everything except the comma-seperated list transform. We need an EXPR_LIST anyways, i'd like
+Lower_expr_flow *implemented in Lower_Binary_Op and Lower_Conditional_Expr* and: We want everything except the comma-seperated list transform. We need an EXPR_LIST anyways, i'd like
                                         to have one which is not binary but uses a std::vector or sth like that
 List_shredder: We want this one :)
@@ -28 +28 @@
                                  nearly everything.
 Pre_post_op_shredder: makes sense, but is a bit more complex.
-Switch_bin_op: should simplify codegen a bit :)
+Switch_bin_op *implented in Lower_Binary_Op*: should simplify codegen a bit :)
 Remove_solo_exprs: because we don't have an Eval_expr facility, we can't really do this pass so easily as phc can.
                                           I'm unsure whether we want to support this or not.

trunk/rphp/frontend/cli/rphp-analyzer.cpp

@@ -36 +36 @@
 
 #include "rphp/analysis/passes/CheckMemoryManagement.h"
+#include "rphp/analysis/passes/Desugar.h"
 #include "rphp/analysis/passes/DumpAST.h"
 #include "rphp/analysis/passes/DumpStats.h"
@@ -62 +63 @@
     cl::opt<bool> dumpAST ("dump-ast", cl::desc("Dump AST"));
     cl::opt<bool> debugParse ("debug-parse", cl::desc("Debug output from parser"));
+    cl::opt<bool> runPasses ("lower", cl::desc("Lowers the AST and dumps it after lowering"));
 
     cl::opt<std::string> passListText ("passes", cl::desc("List of passes to run"));
@@ -99 +101 @@
             passManager.addPass<AST::Pass::DumpAST>();
             passManager.addPass<AST::Pass::DumpStats>();
+        }
+        else if(runPasses) {
+            // make all variables etc in strings accessible to passes which need them
+            passManager.addPass<AST::Pass::SimplifyStrings>();
             passManager.addPass<AST::Pass::CheckMemoryManagement>();
+            
+            // TODO: get variable names here or use variable names which the zend engine
+            // doesn't allow for internal variables.
+            
+            // uses boolean && and ||
+            passManager.addPass<AST::Pass::Split_Builtins>();
+            // uses boolean !
+            passManager.addPass<AST::Pass::Early_Lower_Loops>();
+            // uses conditionals
+            passManager.addPass<AST::Pass::Lower_Binary_Op>();
+
+            passManager.addPass<AST::Pass::Lower_Conditional_Expr>();
+            
+            // do this one late in case other passes are creating return's for whatever reason...
+            passManager.addPass<AST::Pass::Desugar>();
+            
+            // debug output
+            passManager.addPass<AST::Pass::DumpAST>();
+            passManager.addPass<AST::Pass::DumpStats>();
         }
         else if (!passListText.empty()) {
@@ -111 +136 @@
                     passManager.addPass<AST::Pass::DumpAST>();
                     passManager.addPass<AST::Pass::DumpStats>();
-                    passManager.addPass<AST::Pass::CheckMemoryManagement>();
                 }
                 else if (*i == "simplifystrings") {
                     passManager.addPass<AST::Pass::SimplifyStrings>();
-                    passManager.addPass<AST::Pass::CheckMemoryManagement>();
                 }
                 else if (*i == "split-builtins") {
                     passManager.addPass<AST::Pass::Split_Builtins>();
-                    passManager.addPass<AST::Pass::CheckMemoryManagement>();
                 }
                 else if (*i == "early-lower-loops") {
                     passManager.addPass<AST::Pass::Early_Lower_Loops>();
-                    passManager.addPass<AST::Pass::CheckMemoryManagement>();
                 }
                 else if (*i == "lower-binary-ops") {
                     passManager.addPass<AST::Pass::Lower_Binary_Op>();
-                    passManager.addPass<AST::Pass::CheckMemoryManagement>();
                 }
                 else if (*i == "lower-conditional-exprs") {
                     passManager.addPass<AST::Pass::Lower_Conditional_Expr>();
-                    passManager.addPass<AST::Pass::CheckMemoryManagement>();
                 }
             }

trunk/rphp/include/rphp/analysis/pAST.h

@@ -136 +136 @@
                                               CLASS * retain() { stmt::retain(); return this; }
 
-namespace Pass {
-class CheckMemoryManagement;
-}
-
 // statement base class
 class stmt {
@@ -149 +145 @@
     pUInt startLineNum_;
     pUInt endLineNum_;
-    
-    // We need this because we access refCount_ over there.
-    friend class Pass::CheckMemoryManagement;
     
 protected:
@@ -203 +196 @@
       ++refCount_;
       return this;
+    }
+    
+    pUInt getRefCount() const {
+        return refCount_;
     }
 
@@ -1107 +1104 @@
 // return statement
 class returnStmt: public stmt {
-
+    
     expr* rVal_;
     
@@ -1127 +1124 @@
 
     expr* rVal(void) { return rVal_; }
+    void setRVal(pParseContext& C, expr* r) { if(rVal_) rVal_->destroy(C); rVal_= r; }
 
     IMPLEMENT_SUPPORT_MEMBERS(returnStmt);

trunk/rphp/include/rphp/analysis/pPassManager.h

@@ -43 +43 @@
 
     // no copy constructor
-    pPassManager(const pPassManager&) { }
+    pPassManager(const pPassManager&);
 
 public:
@@ -51 +51 @@
 
     /// add a pass. takes ownership.
-    void addPass(AST::pPass* p) {
-        passQueue_.push_back(p);
-    }
+    void addPass(AST::pPass* p);
 
     template <typename PassType>