tor-browser

commit 01c5113076bd28cb500ab8c2fd1ccf31065073be
parent 69d597706844eb1273c519e7a29913b0f992ec35
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date:   Fri,  7 Nov 2025 14:45:41 +0000

Bug 1998955 - Add missing include to arm64 interceptor. r=win-reviewers,gstoll

When building with C++ for aarch64 windows, we get:

  /builds/worker/workspace/obj-build/dist/include/mozilla/interceptor/Arm64.h(200,45): error: expected ';' after expression
    200 |   Trampoline<typename TrampPoolT::MMPolicyT> veneer(
        |                                             ^
  /builds/worker/workspace/obj-build/dist/include/mozilla/interceptor/Arm64.h(200,3): error: use of undeclared identifier 'Trampoline'
    200 |   Trampoline<typename TrampPoolT::MMPolicyT> veneer(
        |   ^
  /builds/worker/workspace/obj-build/dist/include/mozilla/interceptor/Arm64.h(204,3): error: use of undeclared identifier 'veneer'
    204 |   veneer.WriteEncodedPointer(nullptr);
        |   ^
  /builds/worker/workspace/obj-build/dist/include/mozilla/interceptor/Arm64.h(205,3): error: use of undeclared identifier 'veneer'
    205 |   veneer.WriteEncodedPointer(aPrimaryTramp);
        |   ^
  /builds/worker/workspace/obj-build/dist/include/mozilla/interceptor/Arm64.h(207,3): error: use of undeclared identifier 'veneer'
    207 |   veneer.StartExecutableCode();
        |   ^

This seems like a missing include on a function that gets instantiated
or type-checked more eagerly with C++20.

Fix it by including the relevant file.

Differential Revision: https://phabricator.services.mozilla.com/D271777

Diffstat:
M
toolkit/xre/dllservices/mozglue/interceptor/Arm64.h
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/toolkit/xre/dllservices/mozglue/interceptor/Arm64.h b/toolkit/xre/dllservices/mozglue/interceptor/Arm64.h
@@ -16,6 +16,7 @@
 #include "mozilla/Result.h"
 #include "mozilla/Saturate.h"
 #include "mozilla/Types.h"
+#include "mozilla/interceptor/Trampoline.h"
 
 namespace mozilla {
 namespace interceptor {