针对没有签名信息的block的单元测试

SilverFruity · Mar 8, 2021 · 32b9818 · 32b9818
1 parent a16eb93
commit 32b9818
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 69 deletions.
diff --git a/OCRunner/ORCoreImp/ORCoreImp.m b/OCRunner/ORCoreImp/ORCoreImp.m
@@ -29,8 +29,7 @@ void methodIMP(ffi_cif *cfi,void *ret,void **args, void*userdata){
         //针对系统传入的block，检查一次签名，如果没有，将在结构体中添加签名信息.
         if (argValue.isObject && argValue.isBlockValue && NSBlockHasSignature(argValue.objectValue) == NO) {
             ORTypeVarPair *blockdecl = methodImp.declare.parameterTypes[i - 2];
-            ORFuncVariable *blockSig = (ORFuncVariable *)blockdecl.var;
-            if ([blockSig isKindOfClass:[ORFuncVariable class]]) {
+            if ([blockdecl.var isKindOfClass:[ORFuncVariable class]]) {
                 NSBlockSetSignature(argValue.objectValue, blockdecl.blockSignature);
             }
         }
@@ -59,7 +58,7 @@ void methodIMP(ffi_cif *cfi,void *ret,void **args, void*userdata){
 void blockInter(ffi_cif *cfi,void *ret,void **args, void*userdata){
     struct MFSimulateBlock *block = *(void **)args[0];
     MFBlock *mangoBlock =  (__bridge MFBlock *)(block->wrapper);
-    NSMethodSignature *sig = [NSMethodSignature signatureWithObjCTypes:[MFBlock typeEncodingForBlock:mangoBlock.ocBlock]];
+    NSMethodSignature *sig = [NSMethodSignature signatureWithObjCTypes:NSBlockGetSignature(mangoBlock.ocBlock)];
     NSMutableArray<MFValue *> *argValues = [NSMutableArray array];
     for (NSUInteger i = 1; i < cfi->nargs; i++) {
         MFValue *argValue = [[MFValue alloc] initTypeEncode:[sig getArgumentTypeAtIndex:i] pointer:args[i]];

diff --git a/OCRunner/RunEnv/MFBlock.h b/OCRunner/RunEnv/MFBlock.h
@@ -51,6 +51,10 @@ struct MFGOSimulateBlockDescriptor {
 		const char *signature;
 	};
 };
+const char *NSBlockGetSignature(id block);
+BOOL NSBlockHasSignature(id block);
+void NSBlockSetSignature(id block, const char *typeencode);
+void *simulateNSBlock(const char* typeEncoding, void *imp, void *userdata);
 
 @class ORTypeVarPair;
 @interface MFBlock : NSObject
@@ -59,9 +63,5 @@ struct MFGOSimulateBlockDescriptor {
 @property (strong, nonatomic) ORFunctionImp *func;
 @property (strong, nonatomic) NSMutableArray <ORTypeVarPair *>*paramTypes;
 @property (strong, nonatomic) ORTypeVarPair *retType;
-
 - (id)ocBlock;
-+ (const char *)typeEncodingForBlock:(id)block;
 @end
-BOOL NSBlockHasSignature(id block);
-void NSBlockSetSignature(id block, const char *typeencode);
diff --git a/OCRunner/RunEnv/MFBlock.m b/OCRunner/RunEnv/MFBlock.m
@@ -16,27 +16,49 @@
 void copy_helper(struct MFSimulateBlock *dst, struct MFSimulateBlock *src)
 {
     // do not copy anything is this funcion! just retain if need.
-    CFRetain(dst->wrapper);
+    if (dst->wrapper) {
+        CFRetain(dst->wrapper);
+    }
 }
 
 void dispose_helper(struct MFSimulateBlock *src)
 {
-    free((void *)src->descriptor->signature);
-    CFRelease(src->wrapper);
+    if (src->descriptor->signature) {
+        free((void *)src->descriptor->signature);
+    }
+    if (src->descriptor) {
+        free(src->descriptor);
+    }
+    if (src->wrapper) {
+        CFRelease(src->wrapper);
+    }
 }
-
-
-@implementation MFBlock{
-    BOOL _generatedPtr;
-    void *_blockPtr;
-    or_ffi_result *_ffi_result;
-    struct MFGOSimulateBlockDescriptor *_descriptor;
+void *simulateNSBlock(const char* typeEncoding, void *imp, void *userdata){
+    struct MFGOSimulateBlockDescriptor descriptor = {
+        0,
+        sizeof(struct MFSimulateBlock),
+        (void (*)(void *dst, const void *src))copy_helper,
+        (void (*)(const void *src))dispose_helper,
+        typeEncoding
+    };
+    struct MFGOSimulateBlockDescriptor *_descriptor = malloc(sizeof(struct MFGOSimulateBlockDescriptor));
+    memcpy(_descriptor, &descriptor, sizeof(struct MFGOSimulateBlockDescriptor));
+    struct MFSimulateBlock simulateBlock = {
+        &_NSConcreteStackBlock,
+        (BLOCK_HAS_COPY_DISPOSE | BLOCK_CREATED_FROM_MFGO),
+        0,
+        imp,
+        _descriptor,
+        userdata
+    };
+    if (typeEncoding != NULL) {
+        simulateBlock.flags |= BLOCK_HAS_SIGNATURE;
+    }
+    return Block_copy(&simulateBlock);
 }
-
-+ (const char *)typeEncodingForBlock:(id)block{
+const char *NSBlockGetSignature(id block){
     struct MFSimulateBlock *blockRef = (__bridge struct MFSimulateBlock *)block;
     int flags = blockRef->flags;
-
     if (flags & BLOCK_HAS_SIGNATURE) {
         void *signatureLocation = blockRef->descriptor;
         signatureLocation += sizeof(unsigned long int);
@@ -52,7 +74,39 @@ + (const char *)typeEncodingForBlock:(id)block{
     }
     return NULL;
 }
+BOOL NSBlockHasSignature(id block){
+    struct MFSimulateBlock *blockRef = (__bridge struct MFSimulateBlock *)block;
+    int flags = blockRef->flags;
+    return flags & BLOCK_HAS_SIGNATURE;
+}
+void NSBlockSetSignature(id block, const char *typeencode){
+    struct MFSimulateBlock *blockRef = (__bridge struct MFSimulateBlock *)block;
+    void *signatureLocation = blockRef->descriptor;
+    signatureLocation += sizeof(unsigned long int);
+    signatureLocation += sizeof(unsigned long int);
+    int flags = blockRef->flags;
+    if (flags & BLOCK_HAS_COPY_DISPOSE) {
+        signatureLocation += sizeof(void(*)(void *dst, void *src));
+        signatureLocation += sizeof(void (*)(void *src));
+    }
+    char *copied = strdup(typeencode);
+    *(char **)signatureLocation = copied;
+    blockRef->flags |= BLOCK_HAS_SIGNATURE;
+}
 
+@implementation MFBlock{
+    void *_blockPtr;
+    or_ffi_result *_ffi_result;
+}
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        _blockPtr = NULL;
+        _ffi_result = NULL;
+    }
+    return self;
+}
 - (id)ocBlock{
     return [self blockPtr];
 }
@@ -62,60 +116,24 @@ - (void)setParamTypes:(NSMutableArray<ORTypeVarPair *> *)paramTypes{
     _paramTypes = types;
 }
 - (void *)blockPtr{
-    if (_generatedPtr) {
+    if (_blockPtr != NULL) {
         return _blockPtr;
     }
     const char *typeEncoding = self.retType.typeEncode;
     for (ORTypeVarPair *param in self.paramTypes) {
         const char *paramTypeEncoding = param.typeEncode;
         typeEncoding = mf_str_append(typeEncoding, paramTypeEncoding);
     }
-    _generatedPtr = YES;
-    struct MFGOSimulateBlockDescriptor descriptor = {
-        0,
-        sizeof(struct MFSimulateBlock),
-        (void (*)(void *dst, const void *src))copy_helper,
-        (void (*)(const void *src))dispose_helper,
-        typeEncoding
-    };
     _ffi_result = register_function(&blockInter, self.paramTypes, self.retType);
-    _descriptor = malloc(sizeof(struct MFGOSimulateBlockDescriptor));
-    memcpy(_descriptor, &descriptor, sizeof(struct MFGOSimulateBlockDescriptor));
-    struct MFSimulateBlock simulateBlock = {
-        &_NSConcreteStackBlock,
-        (BLOCK_HAS_COPY_DISPOSE | BLOCK_HAS_SIGNATURE | BLOCK_CREATED_FROM_MFGO),
-        0,
-        _ffi_result->function_imp,
-        _descriptor,
-        (__bridge void*)self
-    };
-    _blockPtr = Block_copy(&simulateBlock);
+    _blockPtr = simulateNSBlock(typeEncoding, _ffi_result->function_imp, (__bridge  void *)self);
     return _blockPtr;
 }
 
 -(void)dealloc{
-    free(_descriptor);
-    or_ffi_result_free(_ffi_result);
+    if (_ffi_result != NULL) {
+        or_ffi_result_free(_ffi_result);
+    }
     return;
 }
 
 @end
-BOOL NSBlockHasSignature(id block){
-    struct MFSimulateBlock *blockRef = (__bridge struct MFSimulateBlock *)block;
-    int flags = blockRef->flags;
-    return flags & BLOCK_HAS_SIGNATURE;
-}
-void NSBlockSetSignature(id block, const char *typeencode){
-    struct MFSimulateBlock *blockRef = (__bridge struct MFSimulateBlock *)block;
-    void *signatureLocation = blockRef->descriptor;
-    signatureLocation += sizeof(unsigned long int);
-    signatureLocation += sizeof(unsigned long int);
-    int flags = blockRef->flags;
-    if (flags & BLOCK_HAS_COPY_DISPOSE) {
-        signatureLocation += sizeof(void(*)(void *dst, void *src));
-        signatureLocation += sizeof(void (*)(void *src));
-    }
-    char *copied = strdup(typeencode);
-    *(char **)signatureLocation = copied;
-    blockRef->flags |= BLOCK_HAS_SIGNATURE;
-}
diff --git a/OCRunner/RunnerClasses+Execute.m b/OCRunner/RunnerClasses+Execute.m
@@ -67,7 +67,7 @@ void ORDebugFrameStackPop(void){
 #endif
 
 static MFValue * invoke_MFBlockValue(MFValue *blockValue, NSArray *args){
-    const char *blockTypeEncoding = [MFBlock typeEncodingForBlock:blockValue.objectValue];
+    const char *blockTypeEncoding = NSBlockGetSignature(blockValue.objectValue);
     NSMethodSignature *sig = [NSMethodSignature signatureWithObjCTypes:blockTypeEncoding];
     NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:sig];
     [invocation setTarget:blockValue.objectValue];

diff --git a/OCRunnerDemo/OCRunnerDemo.xcodeproj/xcshareddata/xcschemes/OCRunnerDemo.xcscheme b/OCRunnerDemo/OCRunnerDemo.xcodeproj/xcshareddata/xcschemes/OCRunnerDemo.xcscheme
@@ -27,15 +27,14 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES"
-      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      codeCoverageEnabled = "YES">
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EE98996A24658DA600ACF2C1"
+            BlueprintIdentifier = "28290063C01D00B7961A2F43D82294F6"
             BuildableName = "OCRunner.framework"
             BlueprintName = "OCRunner"
-            ReferencedContainer = "container:../OCRunner.xcodeproj">
+            ReferencedContainer = "container:Pods/Pods.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
       <Testables>

diff --git a/OCRunnerTests/ORTestWithObjc.m b/OCRunnerTests/ORTestWithObjc.m
@@ -13,6 +13,7 @@
 #import "ORRecoverClass.h"
 #import <objc/message.h>
 #import "ORWeakPropertyAndIvar.h"
+#import "ORTestReplaceClass.h"
 @interface ORTestWithObjc : XCTestCase
 @property (nonatomic, strong)MFScopeChain *currentScope;
 @property (nonatomic, strong)MFScopeChain *topScope;
@@ -622,8 +623,23 @@ - (void)testArgumentWithTypeDefBlock{
     MFValue *h = [[MFScopeChain topScope] recursiveGetValueWithIdentifier:@"result"];
     XCTAssert([h.objectValue isEqual:@"123321"]);
 }
-
-
+int signatureBlockPtr(id object, int b){
+    return b * 2;
+}
+- (void)testNoSignatureBlock{
+    NSString *source = @"\
+    @implementation ORTestReplaceClass\
+    - (int)testNoSignatureBlock:(int(^)(int))arg{\
+        return arg(10);\
+    }\
+    @end\
+    ";
+    AST *ast = [OCParser parseSource:source];
+    [ORInterpreter excuteNodes:ast.nodes];
+    id block = (__bridge id)simulateNSBlock(NULL, &signatureBlockPtr, NULL);
+    int result = [[ORTestReplaceClass new] testNoSignatureBlock: block];
+    XCTAssert(result == 20);
+}
 - (void)testOCRecursiveFunctionPerformanceExample {
     [self measureBlock:^{
         fibonaccia(20);

diff --git a/OCRunnerTests/TestClass/ORTestReplaceClass.h b/OCRunnerTests/TestClass/ORTestReplaceClass.h
@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (NSInteger)testOriginalMethod;
 - (NSInteger)testAddGlobalVar;
 - (NSDictionary *(^)(void))testMethodParameterListAndReturnValueWithString:(NSString *)str block:(NSString *(^)(NSString *))block;
+- (int)testNoSignatureBlock:(int(^)(int))arg;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/OCRunnerTests/TestClass/ORTestReplaceClass.m b/OCRunnerTests/TestClass/ORTestReplaceClass.m
@@ -30,5 +30,7 @@ - (NSInteger)testAddGlobalVar{
 - (NSDictionary* (^)(void))testMethodParameterListAndReturnValueWithString:(NSString *)str block:(NSString *(^)(NSString *))block{
     return nil;
 }
-
+- (int)testNoSignatureBlock:(int(^)(int))arg{
+    return 0;
+}
 @end