修复 OCRunner 与 Aspects 等 Swizzle 库一起使用时，补丁方法获取参数/返回值异常的问题

Author: fabcz

OCRunner/ORCoreImp/ORCoreImp.m

@@ -30,10 +30,11 @@ void methodIMP(ffi_cif *cfi,void *ret,void **args, void*userdata){
     __unsafe_unretained id target = *(__unsafe_unretained id *)args[0];
     SEL sel = *(SEL *)args[1];
     BOOL classMethod = object_isClass(target);
-    NSMethodSignature *sig = [target methodSignatureForSelector:sel];
-    NSMutableArray<MFValue *> *argValues = [NSMutableArray array];
-    for (NSUInteger i = 2; i < sig.numberOfArguments; i++) {
-        MFValue *argValue = [[MFValue alloc] initTypeEncode:[sig getArgumentTypeAtIndex:i] pointer:args[i]];
+    NSArray<ORTypeVarPair *> *paramTypes = methodImp.declare.parameterTypes;
+    FATAL_CHECK(cfi->nargs == 2 + paramTypes.count, @"ffi_cif nargs mismatch with parameterTypes");
+    NSMutableArray<MFValue *> *argValues = [NSMutableArray arrayWithCapacity:paramTypes.count];
+    for (NSUInteger i = 0; i < paramTypes.count; i++) {
+        MFValue *argValue = [[MFValue alloc] initTypeEncode:paramTypes[i].typeEncode pointer:args[i + 2]];
         //针对系统传入的block，检查一次签名，如果没有，将在结构体中添加签名信息.
         if (argValue.isObject && argValue.isBlockValue && argValue.objectValue != nil) {
             struct MFSimulateBlock *bb = (void *)argValue->realBaseValue.pointerValue;
@@ -43,7 +44,7 @@ void methodIMP(ffi_cif *cfi,void *ret,void **args, void*userdata){
                 argValue.pointer = &copied;
             }
             if (NSBlockHasSignature(argValue.objectValue) == NO) {
-                ORTypeVarPair *blockdecl = methodImp.declare.parameterTypes[i - 2];
+                ORTypeVarPair *blockdecl = paramTypes[i];
                 if ([blockdecl.var isKindOfClass:[ORFuncVariable class]]) {
                     NSBlockSetSignature(argValue.objectValue, blockdecl.blockSignature);
                 }
@@ -67,7 +68,7 @@ void methodIMP(ffi_cif *cfi,void *ret,void **args, void*userdata){
     returnValue = [methodImp execute:scope];
     if (returnValue.type != TypeVoid && returnValue.pointer != NULL){
         // 类型转换
-        [returnValue writePointer:ret typeEncode:[sig methodReturnType]];
+        [returnValue writePointer:ret typeEncode:methodImp.declare.returnType.typeEncode];
     }
 
     if (ctx.isDeallocScope) {
@@ -112,22 +113,20 @@ void getterImp(ffi_cif *cfi,void *ret,void **args, void*userdata){
     SEL sel = *(SEL *)args[1];
     ORPropertyDeclare *propDef = (__bridge ORPropertyDeclare *)userdata;
     NSString *propName = propDef.var.var.varname;
-    NSMethodSignature *sig = [target methodSignatureForSelector:sel];
     __autoreleasing MFValue *propValue = objc_getAssociatedObject(target, mf_propKey(propName));
     if (!propValue) {
         propValue = [MFValue defaultValueWithTypeEncoding:propDef.var.typeEncode];
     }
     if (propValue.type != TypeVoid && propValue.pointer != NULL){
-        [propValue writePointer:ret typeEncode:sig.methodReturnType];
+        [propValue writePointer:ret typeEncode:propDef.var.typeEncode];
     }
 }
 
 void setterImp(ffi_cif *cfi,void *ret,void **args, void*userdata){
     id target = *(__strong id *)args[0];
-    SEL sel = *(SEL *)args[1];
-    const char *argTypeEncode = [[target methodSignatureForSelector:sel] getArgumentTypeAtIndex:2];
-    MFValue *value = [MFValue valueWithTypeEncode:argTypeEncode pointer:args[2]];
     ORPropertyDeclare *propDef = (__bridge ORPropertyDeclare *)userdata;
+    const char *argTypeEncode = propDef.var.typeEncode;
+    MFValue *value = [MFValue valueWithTypeEncode:argTypeEncode pointer:args[2]];
     NSString *propName = propDef.var.var.varname;
     MFPropertyModifier modifier = propDef.modifier;
     if (modifier & MFPropertyModifierMemWeak) {

OCRunnerDemo/OCRunnerDemo/HotPath/ViewController1.m

@@ -132,6 +132,12 @@ - (void)pushSwiftControlelr1{
     [self.navigationController pushViewController:vc animated:YES];
 }
 
+- (void)buttonAction:(UIButton *)sender
+{
+    NSLog(@"buttonAction hotfix, sender: %@", sender);
+    [self ORGbuttonAction:sender];
+}
+
 @end
 
 int fibonaccia(int n){

OCRunnerDemo/OCRunnerDemo/ViewController.m

@@ -10,6 +10,9 @@
 #import <Masonry/Masonry.h>
 #import <MFBlock.h>
 #import <WebKit/WebKit.h>
+#if __has_include(<Aspects/Aspects.h>)
+#import <Aspects/Aspects.h>
+#endif
 
 @interface ShareInstance: NSObject
 @property (nonatomic,copy)NSDictionary *cache;
@@ -55,7 +58,33 @@ - (void)viewDidLoad {
         make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom);
     }];
     [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://www.baidu.com"]]];
+
+#if __has_include(<Aspects/Aspects.h>)
+    UIButton *aspectButton = ({
+        UIButton *button = [[UIButton alloc] initWithFrame:CGRectMake(50, 300, 150, 50)];
+        [button setTitle:@"Test Aspect" forState:UIControlStateNormal];
+        [button addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
+        button.backgroundColor = UIColor.blackColor;
+        button;
+    });
+    [self.view addSubview:aspectButton];
+
+    [self aspect_hookSelector:@selector(buttonAction:)
+                  withOptions:AspectPositionBefore
+                   usingBlock:^(id<AspectInfo> aspectInfo, UIButton *sender) {
+                       NSLog(@"buttonAction aspects, sender: %@", sender);
+                   }
+                        error:nil];
+#endif
 }
+
+#if __has_include(<Aspects/Aspects.h>)
+- (void)buttonAction:(UIButton *)sender
+{
+    NSLog(@"buttonAction origin, sender: %@", sender);
+}
+#endif
+
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler{
     decisionHandler(WKNavigationActionPolicyAllow);
 }

OCRunnerDemo/Podfile

@@ -8,6 +8,7 @@ target 'OCRunnerDemo' do
   pod 'MJRefresh'
   pod 'MJExtension'
   pod 'Masonry'
+  # pod 'Aspects'
 
   pod 'ORPatchFile', :path => '../oc2mango'
   pod 'oc2mangoLib', :path => '../oc2mango'