fix build after rebase

pyston · Jul 1, 2015 · c964b34 · c964b34
1 parent 50b8638
commit c964b34
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/src/codegen/baseline_jit.cpp b/src/codegen/baseline_jit.cpp
@@ -134,12 +134,11 @@ RewriterVar* JitFragmentWriter::emitBinop(RewriterVar* lhs, RewriterVar* rhs, in
 }
 
 RewriterVar* JitFragmentWriter::emitCallattr(RewriterVar* obj, BoxedString* attr, CallattrFlags flags,
-                                             ArgPassSpec argspec, const llvm::ArrayRef<RewriterVar*> args,
+                                             const llvm::ArrayRef<RewriterVar*> args,
                                              std::vector<BoxedString*>* keyword_names) {
     // We could make this faster but for now: keep it simple, stupid...
     RewriterVar* attr_var = imm(attr);
     RewriterVar* flags_var = imm(flags.asInt());
-    RewriterVar* argspec_var = imm(argspec.asInt());
     RewriterVar* keyword_names_var = keyword_names ? imm(keyword_names) : nullptr;
 
     RewriterVar* args_array = nullptr;
@@ -154,12 +153,10 @@ RewriterVar* JitFragmentWriter::emitCallattr(RewriterVar* obj, BoxedString* attr
     call_args.push_back(obj);
     call_args.push_back(attr_var);
     call_args.push_back(flags_var);
-    call_args.push_back(argspec_var);
 
-// #if ENABLE_BASELINEJIT_ICS
-#if 0 && ENABLE_BASELINEJIT_ICS // disable for now: there is a problem with test/extra/protobuf_test.py
+#if ENABLE_BASELINEJIT_ICS
     if (!keyword_names_var
-        && argspec.totalPassed() < 3) { // looks like runtime ICs with 7 or more args don't work right now..
+        && flags.argspec.totalPassed() < 4) { // looks like runtime ICs with 7 or more args don't work right now..
         use_ic = true;
         call_args.push_back(imm(new CallattrIC));
     }
@@ -551,16 +548,16 @@ Box* JitFragmentWriter::binopICHelper(BinopIC* ic, Box* lhs, Box* rhs, int op) {
 }
 
 #if ENABLE_BASELINEJIT_ICS
-Box* JitFragmentWriter::callattrHelperIC(Box* obj, BoxedString* attr, CallattrFlags flags, ArgPassSpec argspec,
-                                         CallattrIC* ic, Box** args) {
-    auto arg_tuple = getTupleFromArgsArray(&args[0], argspec.totalPassed());
-    return ic->call(obj, attr, flags, argspec, std::get<0>(arg_tuple), std::get<1>(arg_tuple));
+Box* JitFragmentWriter::callattrHelperIC(Box* obj, BoxedString* attr, CallattrFlags flags, CallattrIC* ic, Box** args) {
+    auto arg_tuple = getTupleFromArgsArray(&args[0], flags.argspec.totalPassed());
+    return ic->call(obj, attr, flags, std::get<0>(arg_tuple), std::get<1>(arg_tuple), std::get<2>(arg_tuple), NULL,
+                    NULL);
 }
 #endif
-Box* JitFragmentWriter::callattrHelper(Box* obj, BoxedString* attr, CallattrFlags flags, ArgPassSpec argspec,
-                                       Box** args, std::vector<BoxedString*>* keyword_names) {
-    auto arg_tuple = getTupleFromArgsArray(&args[0], argspec.totalPassed());
-    Box* r = callattr(obj, attr, flags, argspec, std::get<0>(arg_tuple), std::get<1>(arg_tuple), std::get<2>(arg_tuple),
+Box* JitFragmentWriter::callattrHelper(Box* obj, BoxedString* attr, CallattrFlags flags, Box** args,
+                                       std::vector<BoxedString*>* keyword_names) {
+    auto arg_tuple = getTupleFromArgsArray(&args[0], flags.argspec.totalPassed());
+    Box* r = callattr(obj, attr, flags, std::get<0>(arg_tuple), std::get<1>(arg_tuple), std::get<2>(arg_tuple),
                       std::get<3>(arg_tuple), keyword_names);
     assert(gc::isValidGCObject(r));
     return r;

diff --git a/src/codegen/baseline_jit.h b/src/codegen/baseline_jit.h
@@ -151,7 +151,7 @@ class JitFragmentWriter : public Rewriter {
 
     RewriterVar* emitAugbinop(RewriterVar* lhs, RewriterVar* rhs, int op_type);
     RewriterVar* emitBinop(RewriterVar* lhs, RewriterVar* rhs, int op_type);
-    RewriterVar* emitCallattr(RewriterVar* obj, BoxedString* attr, CallattrFlags flags, ArgPassSpec argspec,
+    RewriterVar* emitCallattr(RewriterVar* obj, BoxedString* attr, CallattrFlags flags,
                               const llvm::ArrayRef<RewriterVar*> args, std::vector<BoxedString*>* keyword_names);
     RewriterVar* emitCompare(RewriterVar* lhs, RewriterVar* rhs, int op_type);
     RewriterVar* emitCreateDict(const llvm::ArrayRef<RewriterVar*> keys, const llvm::ArrayRef<RewriterVar*> values);
@@ -215,7 +215,7 @@ class JitFragmentWriter : public Rewriter {
 
     static Box* augbinopICHelper(AugBinopIC* ic, Box* lhs, Box* rhs, int op);
     static Box* binopICHelper(BinopIC* ic, Box* lhs, Box* rhs, int op);
-    static Box* callattrHelper(Box* obj, BoxedString* attr, CallattrFlags flags, ArgPassSpec argspec, Box** args,
+    static Box* callattrHelper(Box* obj, BoxedString* attr, CallattrFlags flags, Box** args,
                                std::vector<BoxedString*>* keyword_names);
     static Box* compareICHelper(CompareIC* ic, Box* lhs, Box* rhs, int op);
     static Box* createDictHelper(uint64_t num, Box** keys, Box** values);
@@ -236,8 +236,7 @@ class JitFragmentWriter : public Rewriter {
     static Box* unaryopICHelper(UnaryopIC* ic, Box* obj, int op);
 
 #if ENABLE_BASELINEJIT_ICS
-    static Box* callattrHelperIC(Box* obj, BoxedString* attr, CallattrFlags flags, ArgPassSpec argspec, CallattrIC* ic,
-                                 Box** args);
+    static Box* callattrHelperIC(Box* obj, BoxedString* attr, CallattrFlags flags, CallattrIC* ic, Box** args);
     static Box* runtimeCallHelperIC(Box* obj, ArgPassSpec argspec, RuntimeCallIC* ic, Box** args);
 #endif