Remove TSRMLS_CC support from fcall optimizers

See: zephir-lang#1865
dreamsxin · Nov 6, 2019 · 91e4e60 · 91e4e60
1 parent a7f71e9
commit 91e4e60
Show file tree

Hide file tree

Showing 53 changed files with 66 additions and 66 deletions.
diff --git a/Library/Optimizers/FunctionCall/AddslashesOptimizer.php b/Library/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -65,7 +65,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_addslashes('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_addslashes('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -48,6 +48,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         //Note: the first parameter is key in php array_key_exists
-        return new CompiledExpression('bool', 'zephir_array_key_exists('.$resolvedParams[1].', '.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_array_key_exists('.$resolvedParams[1].', '.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_array_keys('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_array_keys('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -63,7 +63,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $resolveParam = $this->createParamResolver($context);
-        $context->codePrinter->output('zephir_fast_array_merge('.$symbol.', '.$resolveParam($resolvedParams[0]).', '.$resolveParam($resolvedParams[1]).' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_fast_array_merge('.$symbol.', '.$resolveParam($resolvedParams[0]).', '.$resolveParam($resolvedParams[1]).');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/BasenameOptimizer.php b/Library/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_basename('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_basename('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/CeilOptimizer.php b/Library/Optimizers/FunctionCall/CeilOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('double', 'zephir_ceil('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('double', 'zephir_ceil('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php b/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php
@@ -57,6 +57,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/object');
 
-        return new CompiledExpression('bool', 'zephir_class_exists('.$resolvedParams[0].', '.$autoload.' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_class_exists('.$resolvedParams[0].', '.$autoload.')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php b/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php
@@ -52,6 +52,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_compare_mtime('.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_compare_mtime('.$resolvedParams[0].', '.$resolvedParams[1].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/CountOptimizer.php b/Library/Optimizers/FunctionCall/CountOptimizer.php
@@ -42,6 +42,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('int', 'zephir_fast_count_int('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('int', 'zephir_fast_count_int('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php b/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -72,9 +72,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if ($resolvedParams) {
-            $context->codePrinter->output('zephir_create_array('.$symbol.', zephir_get_intval('.$resolvedParams[0].'), 1 TSRMLS_CC);');
+            $context->codePrinter->output('zephir_create_array('.$symbol.', zephir_get_intval('.$resolvedParams[0].'), 1);');
         } else {
-            $context->codePrinter->output('zephir_create_array('.$symbol.', 0, 1 TSRMLS_CC);');
+            $context->codePrinter->output('zephir_create_array('.$symbol.', 0, 1);');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);

diff --git a/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -74,7 +74,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->addCallStatusFlag($context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance('.$symbol.', '.$resolvedParams[0].');');
 
         $call->checkTempParameters($context);
         $call->addCallStatusOrJump($context);

diff --git a/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -69,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->addCallStatusFlag($context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
         $call->addCallStatusOrJump($context);
 

diff --git a/Library/Optimizers/FunctionCall/EvalOptimizer.php b/Library/Optimizers/FunctionCall/EvalOptimizer.php
@@ -69,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            sprintf('zephir_eval_php(%s, %s, "%s" TSRMLS_CC);', $resolvedParams[0], $symbol, $evalContext)
+            sprintf('zephir_eval_php(%s, %s, "%s");', $resolvedParams[0], $symbol, $evalContext)
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);

diff --git a/Library/Optimizers/FunctionCall/ExplodeOptimizer.php b/Library/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -86,12 +86,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($str)) {
-            $context->codePrinter->output('zephir_fast_explode_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].', '.$limit.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_fast_explode_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].', '.$limit.');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        $context->codePrinter->output('zephir_fast_explode('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$limit.' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_fast_explode('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$limit.');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/FcloseOptimizer.php b/Library/Optimizers/FunctionCall/FcloseOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_fclose('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_fclose('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FeofOptimizer.php b/Library/Optimizers/FunctionCall/FeofOptimizer.php
@@ -44,6 +44,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_feof('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_feof('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FileExistsOptimizer.php b/Library/Optimizers/FunctionCall/FileExistsOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', '(zephir_file_exists('.$resolvedParams[0].' TSRMLS_CC) == SUCCESS)', $expression);
+        return new CompiledExpression('bool', '(zephir_file_exists('.$resolvedParams[0].') == SUCCESS)', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
@@ -63,11 +63,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
         if ($symbolVariable) {
             $symbol = $context->backend->getVariableCode($symbolVariable);
-            $context->codePrinter->output('zephir_file_get_contents('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_file_get_contents('.$symbol.', '.$resolvedParams[0].');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_file_get_contents(NULL, '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_file_get_contents(NULL, '.$resolvedParams[0].');');
         }
 
         return new CompiledExpression('null', 'null', $expression);

diff --git a/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php b/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php
@@ -63,11 +63,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             if ($call->mustInitSymbolVariable()) {
                 $symbolVariable->initVariant($context);
             }
-            $context->codePrinter->output('zephir_file_put_contents('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_file_put_contents('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_file_put_contents(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_file_put_contents(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].');');
         }
 
         return new CompiledExpression('null', 'null', $expression);

diff --git a/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php b/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_filemtime('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_filemtime('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/FloorOptimizer.php b/Library/Optimizers/FunctionCall/FloorOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('double', 'zephir_floor('.$resolvedParams[0].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('double', 'zephir_floor('.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php b/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php
@@ -79,7 +79,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             if ($context->backend->isZE3()) {
                 $template = 'zephir_get_arg(%s, zephir_get_intval(%s));';
             } else {
-                $template = 'zephir_get_arg(%s, zephir_get_intval(%s) TSRMLS_CC);';
+                $template = 'zephir_get_arg(%s, zephir_get_intval(%s));';
             }
 
             $context->codePrinter->output(sprintf($template, $symbol, $resolvedParams[0]));

diff --git a/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -53,7 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if ($context->backend->isZE3()) {
             $context->codePrinter->output('zephir_get_args('.$symbol.');');
         } else {
-            $context->codePrinter->output('zephir_get_args('.$symbol.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_get_args('.$symbol.');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);

diff --git a/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php b/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php
@@ -49,9 +49,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             /* TODO: Solve this macro stuff better, move to backend */
             $macro = $context->backend->isZE3() ? 'SL' : 'SS';
 
-            return new CompiledExpression('bool', '(zephir_function_exists_ex('.$macro.'("'.strtolower($str).'") TSRMLS_CC) == SUCCESS)', $expression);
+            return new CompiledExpression('bool', '(zephir_function_exists_ex('.$macro.'("'.strtolower($str).'")) == SUCCESS)', $expression);
         }
 
-        return new CompiledExpression('bool', '(zephir_function_exists('.$resolvedParams[0].' TSRMLS_CC)  == SUCCESS)', $expression);
+        return new CompiledExpression('bool', '(zephir_function_exists('.$resolvedParams[0].')  == SUCCESS)', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/FwriteOptimizer.php b/Library/Optimizers/FunctionCall/FwriteOptimizer.php
@@ -63,11 +63,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $symbolVariable->initVariant($context);
             }
             $symbol = $context->backend->getVariableCode($symbolVariable);
-            $context->codePrinter->output('zephir_fwrite('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_fwrite('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_fwrite(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_fwrite(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].');');
         }
 
         return new CompiledExpression('null', 'null', $expression);

diff --git a/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('string');
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_get_called_class('.$symbol.' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_get_called_class('.$symbol.');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -65,7 +65,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 1 TSRMLS_CC);');
+        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 1);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php b/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -65,9 +65,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (!isset($resolvedParams[1])) {
-            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', 0 TSRMLS_CC);');
+            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', 0);');
         } else {
-            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);

diff --git a/Library/Optimizers/FunctionCall/GetClassOptimizer.php b/Library/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 0 TSRMLS_CC);');
+        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 0);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -48,7 +48,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if ($context->backend->isZE3()) {
             $context->codePrinter->output('zephir_get_defined_vars('.$symbol.');');
         } else {
-            $context->codePrinter->output('zephir_get_defined_vars('.$symbol.' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_get_defined_vars('.$symbol.');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);

diff --git a/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php b/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
@@ -62,7 +62,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_get_ns_class('.$symbol.', '.$resolvedParams[0].', 0 TSRMLS_CC);');
+        $context->codePrinter->output('zephir_get_ns_class('.$symbol.', '.$resolvedParams[0].', 0);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/GettypeOptimizer.php b/Library/Optimizers/FunctionCall/GettypeOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_gettype('.$symbol.', '.$resolvedParams[0].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_gettype('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/ImplodeOptimizer.php b/Library/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -70,12 +70,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($str)) {
-            $context->codePrinter->output('zephir_fast_join_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].' TSRMLS_CC);');
+            $context->codePrinter->output('zephir_fast_join_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        $context->codePrinter->output('zephir_fast_join('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC);');
+        $context->codePrinter->output('zephir_fast_join('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

diff --git a/Library/Optimizers/FunctionCall/InArrayOptimizer.php b/Library/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -47,6 +47,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_fast_in_array('.$resolvedParams[0].', '.$resolvedParams[1].' TSRMLS_CC)', $expression);
+        return new CompiledExpression('bool', 'zephir_fast_in_array('.$resolvedParams[0].', '.$resolvedParams[1].')', $expression);
     }
 }