From 82b1bf2024591d6cd85e9ecd9ec704f67444e3c2 Mon Sep 17 00:00:00 2001
From: Chris Wailes <chriswailes@google.com>
Date: Wed, 12 May 2021 17:16:50 -0700
Subject: Remove stack protector from some interpreter functions

This CL removes stack protection from several functions in the
interpreter to allow us to re-set the stack protector cookie when new
processes fork from any of the zygotes.

Test: boot
Bug: 168258494
Change-Id: Id65d0d96b028599f27f74c25e279a03b85e52651
---
 runtime/interpreter/interpreter_common.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime/interpreter/interpreter_common.cc')

diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc
index afba57eff2..4ee4cb5a9f 100644
--- a/runtime/interpreter/interpreter_common.cc
+++ b/runtime/interpreter/interpreter_common.cc
@@ -254,6 +254,7 @@ ALWAYS_INLINE void CopyRegisters(ShadowFrame& caller_frame,
 
 // END DECLARATIONS.
 
+NO_STACK_PROTECTOR
 void ArtInterpreterToCompiledCodeBridge(Thread* self,
                                         ArtMethod* caller,
                                         ShadowFrame* shadow_frame,
@@ -1410,6 +1411,7 @@ static inline bool DoCallCommon(ArtMethod* called_method,
 }
 
 template<bool is_range, bool do_assignability_check>
+NO_STACK_PROTECTOR
 bool DoCall(ArtMethod* called_method, Thread* self, ShadowFrame& shadow_frame,
             const Instruction* inst, uint16_t inst_data, JValue* result) {
   // Argument word count.
-- 
cgit v1.2.3-59-g8ed1b