Merge branch 'test/remote-application-refactor' of https://github.com/newrelic/newrelic-dotnet-agent into test/remote-application-refactor

tippmar-nr · tippmar-nr · commit 830f234a7426 · 2025-06-23T10:36:35.000-05:00
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriter/InstrumentFunctionManipulator.h b/src/Agent/NewRelic/Profiler/MethodRewriter/InstrumentFunctionManipulator.h
@@ -32,9 +32,9 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter
 
     private:
         InstrumentationSettingsPtr _instrumentationSettings;
-        uint16_t _tracerLocalIndex;
-        uint16_t _resultLocalIndex;
-        uint16_t _userExceptionLocalIndex;
+        uint16_t _tracerLocalIndex = 0;
+        uint16_t _resultLocalIndex = 0;
+        uint16_t _userExceptionLocalIndex = 0;
 
         void BuildDefaultInstructions(Configuration::InstrumentationPointPtr instrumentationPoint)
         {
@@ -228,4 +228,4 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter
                 _resultLocalIndex = AppendReturnTypeLocal(_newLocalVariablesSignature, _methodSignature);
         }
     };
-}}}
+}}}
diff --git a/src/Agent/NewRelic/Profiler/MethodRewriter/Instrumentors.h b/src/Agent/NewRelic/Profiler/MethodRewriter/Instrumentors.h
@@ -116,7 +116,7 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter
     // An instrumentor for the methods we inject into mscorlib
     struct HelperInstrumentor : public IInstrumentor
     {
-        bool Instrument(IFunctionPtr function, InstrumentationSettingsPtr instrumentationSettings) override
+        bool Instrument(IFunctionPtr function, InstrumentationSettingsPtr) override
         {
             if (!Strings::EndsWith(function->GetModuleName(), _X("mscorlib.dll")))
                 return false;
diff --git a/src/Agent/NewRelic/Profiler/Profiler/Function.h b/src/Agent/NewRelic/Profiler/Profiler/Function.h
@@ -246,7 +246,7 @@ namespace NewRelic { namespace Profiler
             const FunctionID functionId,
             CComPtr<IMetaDataImport2> metaDataImport,
             CComPtr<IMetaDataAssemblyImport> metaDataAssemblyImport,
-            std::shared_ptr<MethodRewriter::MethodRewriter> methodRewriter,
+            std::shared_ptr<MethodRewriter::MethodRewriter>,
             AppDomainID appDomainId,
             ULONG signatureSize,
             const uint8_t* signature,
diff --git a/src/Agent/NewRelic/Profiler/Profiler/FunctionPreprocessor.h b/src/Agent/NewRelic/Profiler/Profiler/FunctionPreprocessor.h
@@ -99,15 +99,15 @@ namespace NewRelic {
                     return xstring_t((_valid ? _X("[") : _X("*["))) + to_hex_string(_offset) + _X("] : ") + _opcode->name;
                 }
 
-                virtual void ResolveTargets(ByteVectorPtr methodBody, std::shared_ptr<std::map<unsigned, std::shared_ptr<Instruction>>> instructions)
+                virtual void ResolveTargets(ByteVectorPtr, std::shared_ptr<std::map<unsigned, std::shared_ptr<Instruction>>>)
                 {
                 }
 
-                virtual void WriteBranches(ByteVectorPtr instructions, std::shared_ptr<std::map<unsigned, std::shared_ptr<Instruction>>> instructionMap)
+                virtual void WriteBranches(ByteVectorPtr, std::shared_ptr<std::map<unsigned, std::shared_ptr<Instruction>>>)
                 {
                 }
 
-                virtual void OnInstructionChange(std::shared_ptr<Instruction> oldInstruction, std::shared_ptr<Instruction> newInstruction)
+                virtual void OnInstructionChange(std::shared_ptr<Instruction>, std::shared_ptr<Instruction>)
                 {
                 }
 
@@ -171,7 +171,7 @@ namespace NewRelic {
                     _targets = std::make_shared<std::list<InstructionPtr>>();
                 }
 
-                virtual void WriteBranches(ByteVectorPtr instructions, OffsetToInstructionMapPtr instructionMap) override
+                virtual void WriteBranches(ByteVectorPtr instructions, OffsetToInstructionMapPtr) override
                 {
                     if (_valid)
                     {
@@ -254,7 +254,7 @@ namespace NewRelic {
                     }
                 }
 
-                virtual void WriteBranches(ByteVectorPtr instructions, OffsetToInstructionMapPtr instructionMap) override
+                virtual void WriteBranches(ByteVectorPtr instructions, OffsetToInstructionMapPtr) override
                 {
                     if (_valid)
                     {
@@ -498,7 +498,7 @@ namespace NewRelic {
                     return true;
                 }
 
-                static bool PassesCheck(ByteVectorPtr functionBytes, OffsetToInstructionMapPtr firstPassInstructions)
+                static bool PassesCheck(ByteVectorPtr functionBytes, OffsetToInstructionMapPtr)
                 {
                     const unsigned headerSize = sizeof(COR_ILMETHOD_FAT);
                     COR_ILMETHOD_FAT* header = (COR_ILMETHOD_FAT*)functionBytes->data();
@@ -524,15 +524,20 @@ namespace NewRelic {
                     return true;
                 }
 
+#ifdef DEBUG
                 static void PrintInstructions(OffsetToInstructionMapPtr instructions)
                 {
-#ifdef DEBUG
                     for (auto iter : *instructions.get())
                     {
                         LogInfo(iter.second->ToString());
                     }
-#endif
                 }
+#else
+                static void PrintInstructions(OffsetToInstructionMapPtr)
+                {
+
+                }
+#endif
 
                 bool WriteSEH(ByteVectorPtr newByteCode, OffsetToInstructionMapPtr instructions) {
                     if (_headerInfo->HasSEH()) {
diff --git a/src/Agent/NewRelic/Profiler/RapidXML/rapidxml.hpp b/src/Agent/NewRelic/Profiler/RapidXML/rapidxml.hpp
@@ -658,6 +658,8 @@ namespace rapidxml
             : m_name(0)
             , m_value(0)
             , m_parent(0)
+            , m_name_size(0)
+            , m_value_size(0)
         {
         }
 
@@ -808,6 +810,8 @@ namespace rapidxml
         //! Constructs an empty attribute with the specified type. 
         //! Consider using memory_pool of appropriate xml_document if allocating attributes manually.
         xml_attribute()
+            : m_next_attribute(nullptr)
+            , m_prev_attribute(nullptr)
         {
         }
 
@@ -902,6 +906,9 @@ namespace rapidxml
             : m_type(type)
             , m_first_node(0)
             , m_first_attribute(0)
+            , m_last_node(nullptr)
+            , m_next_sibling(nullptr)
+            , m_prev_sibling(nullptr)
         {
         }
 
diff --git a/src/Agent/NewRelic/Profiler/SignatureParser/Types.h b/src/Agent/NewRelic/Profiler/SignatureParser/Types.h
@@ -510,7 +510,7 @@ namespace NewRelic { namespace Profiler { namespace SignatureParser
 
         MvarType(uint32_t number) : Type(Kind::MVAR), _number(number) {}
 
-        virtual xstring_t ToString(ITokenResolverPtr tokenResolver) const override
+        virtual xstring_t ToString(ITokenResolverPtr) const override
         {
             return _X("!!") + to_xstring(_number);
         }
@@ -531,7 +531,7 @@ namespace NewRelic { namespace Profiler { namespace SignatureParser
 
         VarType(uint32_t number) : Type(Kind::VAR), _number(number) {}
         
-        virtual xstring_t ToString(ITokenResolverPtr tokenResolver) const override
+        virtual xstring_t ToString(ITokenResolverPtr) const override
         {
             return _X("!") + to_xstring(_number);
         }
@@ -573,7 +573,7 @@ namespace NewRelic { namespace Profiler { namespace SignatureParser
     {
         VoidPointerType() : Type(Kind::VOIDPOINTER) {}
 
-        virtual xstring_t ToString(ITokenResolverPtr tokenResolver) const override
+        virtual xstring_t ToString(ITokenResolverPtr) const override
         {
             return _X("void*");
         }

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ namespace NewRelic { namespace Profiler { namespace MethodRewriter`
`116`	`116`	`// An instrumentor for the methods we inject into mscorlib`
`117`	`117`	`struct HelperInstrumentor : public IInstrumentor`
`118`	`118`	`{`
`119`		`- bool Instrument(IFunctionPtr function, InstrumentationSettingsPtr instrumentationSettings) override`
	`119`	`+ bool Instrument(IFunctionPtr function, InstrumentationSettingsPtr) override`
`120`	`120`	`{`
`121`	`121`	`if (!Strings::EndsWith(function->GetModuleName(), _X("mscorlib.dll")))`
`122`	`122`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -99,15 +99,15 @@ namespace NewRelic {`
`99`	`99`	`return xstring_t((_valid ? _X("[") : _X("*["))) + to_hex_string(_offset) + _X("] : ") + _opcode->name;`
`100`	`100`	`}`
`101`	`101`
`102`		`- virtual void ResolveTargets(ByteVectorPtr methodBody, std::shared_ptr<std::map<unsigned, std::shared_ptr<Instruction>>> instructions)`
	`102`	`+ virtual void ResolveTargets(ByteVectorPtr, std::shared_ptr<std::map<unsigned, std::shared_ptr<Instruction>>>)`
`103`	`103`	`{`
`104`	`104`	`}`
`105`	`105`
`106`		`- virtual void WriteBranches(ByteVectorPtr instructions, std::shared_ptr<std::map<unsigned, std::shared_ptr<Instruction>>> instructionMap)`
	`106`	`+ virtual void WriteBranches(ByteVectorPtr, std::shared_ptr<std::map<unsigned, std::shared_ptr<Instruction>>>)`
`107`	`107`	`{`
`108`	`108`	`}`
`109`	`109`
`110`		`- virtual void OnInstructionChange(std::shared_ptr<Instruction> oldInstruction, std::shared_ptr<Instruction> newInstruction)`
	`110`	`+ virtual void OnInstructionChange(std::shared_ptr<Instruction>, std::shared_ptr<Instruction>)`
`111`	`111`	`{`
`112`	`112`	`}`
`113`	`113`
`@@ -171,7 +171,7 @@ namespace NewRelic {`
`171`	`171`	`_targets = std::make_shared<std::list<InstructionPtr>>();`
`172`	`172`	`}`
`173`	`173`
`174`		`- virtual void WriteBranches(ByteVectorPtr instructions, OffsetToInstructionMapPtr instructionMap) override`
	`174`	`+ virtual void WriteBranches(ByteVectorPtr instructions, OffsetToInstructionMapPtr) override`
`175`	`175`	`{`
`176`	`176`	`if (_valid)`
`177`	`177`	`{`
`@@ -254,7 +254,7 @@ namespace NewRelic {`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`257`		`- virtual void WriteBranches(ByteVectorPtr instructions, OffsetToInstructionMapPtr instructionMap) override`
	`257`	`+ virtual void WriteBranches(ByteVectorPtr instructions, OffsetToInstructionMapPtr) override`
`258`	`258`	`{`
`259`	`259`	`if (_valid)`
`260`	`260`	`{`
`@@ -498,7 +498,7 @@ namespace NewRelic {`
`498`	`498`	`return true;`
`499`	`499`	`}`
`500`	`500`
`501`		`- static bool PassesCheck(ByteVectorPtr functionBytes, OffsetToInstructionMapPtr firstPassInstructions)`
	`501`	`+ static bool PassesCheck(ByteVectorPtr functionBytes, OffsetToInstructionMapPtr)`
`502`	`502`	`{`
`503`	`503`	`const unsigned headerSize = sizeof(COR_ILMETHOD_FAT);`
`504`	`504`	`COR_ILMETHOD_FAT* header = (COR_ILMETHOD_FAT*)functionBytes->data();`
`@@ -524,15 +524,20 @@ namespace NewRelic {`
`524`	`524`	`return true;`
`525`	`525`	`}`
`526`	`526`
	`527`	`+#ifdef DEBUG`
`527`	`528`	`static void PrintInstructions(OffsetToInstructionMapPtr instructions)`
`528`	`529`	`{`
`529`		`-#ifdef DEBUG`
`530`	`530`	`for (auto iter : *instructions.get())`
`531`	`531`	`{`
`532`	`532`	`LogInfo(iter.second->ToString());`
`533`	`533`	`}`
`534`		`-#endif`
`535`	`534`	`}`
	`535`	`+#else`
	`536`	`+ static void PrintInstructions(OffsetToInstructionMapPtr)`
	`537`	`+ {`
	`538`	`+`
	`539`	`+ }`
	`540`	`+#endif`
`536`	`541`
`537`	`542`	`bool WriteSEH(ByteVectorPtr newByteCode, OffsetToInstructionMapPtr instructions) {`
`538`	`543`	`if (_headerInfo->HasSEH()) {`
Original file line number	Diff line number	Diff line change
`@@ -658,6 +658,8 @@ namespace rapidxml`
`658`	`658`	`: m_name(0)`
`659`	`659`	`, m_value(0)`
`660`	`660`	`, m_parent(0)`
	`661`	`+ , m_name_size(0)`
	`662`	`+ , m_value_size(0)`
`661`	`663`	`{`
`662`	`664`	`}`
`663`	`665`
`@@ -808,6 +810,8 @@ namespace rapidxml`
`808`	`810`	`//! Constructs an empty attribute with the specified type.`
`809`	`811`	`//! Consider using memory_pool of appropriate xml_document if allocating attributes manually.`
`810`	`812`	`xml_attribute()`
	`813`	`+ : m_next_attribute(nullptr)`
	`814`	`+ , m_prev_attribute(nullptr)`
`811`	`815`	`{`
`812`	`816`	`}`
`813`	`817`
`@@ -902,6 +906,9 @@ namespace rapidxml`
`902`	`906`	`: m_type(type)`
`903`	`907`	`, m_first_node(0)`
`904`	`908`	`, m_first_attribute(0)`
	`909`	`+ , m_last_node(nullptr)`
	`910`	`+ , m_next_sibling(nullptr)`
	`911`	`+ , m_prev_sibling(nullptr)`
`905`	`912`	`{`
`906`	`913`	`}`
`907`	`914`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ namespace NewRelic { namespace Profiler { namespace SignatureParser`
`510`	`510`
`511`	`511`	`MvarType(uint32_t number) : Type(Kind::MVAR), _number(number) {}`
`512`	`512`
`513`		`- virtual xstring_t ToString(ITokenResolverPtr tokenResolver) const override`
	`513`	`+ virtual xstring_t ToString(ITokenResolverPtr) const override`
`514`	`514`	`{`
`515`	`515`	`return _X("!!") + to_xstring(_number);`
`516`	`516`	`}`
`@@ -531,7 +531,7 @@ namespace NewRelic { namespace Profiler { namespace SignatureParser`
`531`	`531`
`532`	`532`	`VarType(uint32_t number) : Type(Kind::VAR), _number(number) {}`
`533`	`533`
`534`		`- virtual xstring_t ToString(ITokenResolverPtr tokenResolver) const override`
	`534`	`+ virtual xstring_t ToString(ITokenResolverPtr) const override`
`535`	`535`	`{`
`536`	`536`	`return _X("!") + to_xstring(_number);`
`537`	`537`	`}`
`@@ -573,7 +573,7 @@ namespace NewRelic { namespace Profiler { namespace SignatureParser`
`573`	`573`	`{`
`574`	`574`	`VoidPointerType() : Type(Kind::VOIDPOINTER) {}`
`575`	`575`
`576`		`- virtual xstring_t ToString(ITokenResolverPtr tokenResolver) const override`
	`576`	`+ virtual xstring_t ToString(ITokenResolverPtr) const override`
`577`	`577`	`{`
`578`	`578`	`return _X("void*");`
`579`	`579`	`}`