remove useless + revert changes in native part

Author: e-n-0

tracer/src/Datadog.Trace/Iast/Aspects/System.Runtime/DefaultInterpolatedStringHandlerIntegration.cs

@@ -271,7 +271,6 @@ namespace iast
         mdTypeRef targetMethodTypeRef = 0; 
         mdMemberRef targetMethodRef = 0;
         mdTypeRef targetTypeRef = 0; 
-        bool isRefStruct = false;
         std::vector<mdTypeRef> paramTypeRefs; 
         std::vector<mdMemberRef> targetMethodRefCandidates;
         hr = module->FindTypeRefByName(_targetMethodType.c_str(), &targetMethodTypeRef);
@@ -341,7 +340,7 @@ namespace iast
 
             if (targetMethodRef != 0)
             {
-                return new DataflowAspectReference(moduleAspects, this, targetMethodRef, targetTypeRef, isRefStruct, paramTypeRefs);
+                return new DataflowAspectReference(moduleAspects, this, targetMethodRef, targetTypeRef, paramTypeRefs);
             }
         }
         return nullptr;
@@ -354,7 +353,7 @@ namespace iast
 
     //------------------------------
 
-    DataflowAspectReference::DataflowAspectReference(ModuleAspects* moduleAspects, DataflowAspect* aspect, mdMemberRef method, mdTypeRef type, bool isRefStruct, const std::vector<mdTypeRef>& paramType)
+DataflowAspectReference::DataflowAspectReference(ModuleAspects* moduleAspects, DataflowAspect* aspect, mdMemberRef method, mdTypeRef type, const std::vector<mdTypeRef>& paramType)
     {
         this->_moduleAspects = moduleAspects;
         this->_module = moduleAspects->_module;
@@ -587,17 +586,15 @@ namespace iast
                                 continue;
                             }
 
-                            auto instructionInfo =
-                                processor->StackAnalysis()->GetInstruction(instructionToProcess.instruction);
+                            auto instructionInfo = processor->StackAnalysis()->GetInstruction(instructionToProcess.instruction);
                             auto methodSig = instructionInfo->GetArgumentSignature();
                             int paramCount = methodSig->GetEffectiveParamCount();
                             for (auto iInfo : processor->StackAnalysis()->LocateCallParamInstructions(
                                      instruction,
                                      paramCount - _aspect->_paramShift[x] - 1)) // Locate param load instruction
                             {
                                 auto paramType = _targetParamTypeToken[x];
-                                processor->InsertAfter(iInfo->_instruction,
-                                                       processor->NewILInstr(CEE_BOX, paramType, true));
+                                processor->InsertAfter(iInfo->_instruction, processor->NewILInstr(CEE_BOX, paramType, true));
 
                                 // Figure out if param is byref
                                 if (iInfo->IsArgument())
@@ -606,8 +603,7 @@ namespace iast
                                     auto param = sig->_params[iInfo->_instruction->m_Arg32];
                                     if (param->IsByRef())
                                     {
-                                        processor->InsertAfter(iInfo->_instruction,
-                                                               processor->NewILInstr(CEE_LDOBJ, paramType, true));
+                                        processor->InsertAfter(iInfo->_instruction, processor->NewILInstr(CEE_LDOBJ, paramType, true));
                                     }
                                 }
 

tracer/src/Datadog.Tracer.Native/iast/dataflow_aspects.cpp

@@ -41,6 +41,7 @@ namespace iast
     protected:
         WSTRING _line = EmptyWStr;
         bool _isValid = false;
+        mdTypeDef _aspectTypeDef = 0;
 
     public:
         Dataflow* _dataflow;
@@ -122,15 +123,14 @@ namespace iast
     class DataflowAspectReference
     {
     public:
-        DataflowAspectReference(ModuleAspects* moduleAspects, DataflowAspect* aspect, mdMemberRef targetMethod, mdTypeRef targetType, bool isRefStruct, const std::vector<mdTypeRef>& paramType);
+        DataflowAspectReference(ModuleAspects* moduleAspects, DataflowAspect* aspect, mdMemberRef targetMethod, mdTypeRef targetType, const std::vector<mdTypeRef>& paramType);
 
     public:
         DataflowAspect* _aspect = nullptr;
         ModuleAspects* _moduleAspects = nullptr;
         ModuleInfo* _module = nullptr;
         mdMemberRef _targetMethodRef = 0;
         mdTypeRef _targetTypeRef = 0;
-        bool _isRefStruct = false;
         std::vector<mdTypeRef> _targetParamTypeToken;
         std::vector<AspectFilter*> _filters;