summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaichi Hirono2017-06-20 02:18:32 -0500
committerDaichi Hirono2017-06-23 02:15:27 -0500
commitd9cda90ad456ce4cc2f954a4228d85799c3fc7d2 (patch)
tree1a6002cd83726d597f5c146bf62797f4ff612bae /libappfuse/FuseBuffer.cc
parent1d873b35126ee5026a2429cfc8e02fe8e42e09bc (diff)
downloadplatform-system-core-d9cda90ad456ce4cc2f954a4228d85799c3fc7d2.tar.gz
platform-system-core-d9cda90ad456ce4cc2f954a4228d85799c3fc7d2.tar.xz
platform-system-core-d9cda90ad456ce4cc2f954a4228d85799c3fc7d2.zip
Add volatile to temporary variable.
FuseBuffer::HandleNotImpl save the value of |request.header.unique| to the temporary variable, clear the buffer which is a union of |request| and |response|, then write back the unique value to response.header.unique. Before the CL, the temporary variable was wrongly removed by the compiler optimization, and response.header.unique was always 0. The CL adds volatile modifier as workaround to prevent the compiler optimization from removing the temporary value. Bug: 62429763 Test: libappfuse_tests Change-Id: Ia853f805633f646f316f585a35c7b018000b6eb3 (cherry picked from commit a6dee5e279de56751238f750d12f8a6237992043)
Diffstat (limited to 'libappfuse/FuseBuffer.cc')
-rw-r--r--libappfuse/FuseBuffer.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/libappfuse/FuseBuffer.cc b/libappfuse/FuseBuffer.cc
index 1b47e0a35..1eab46cb4 100644
--- a/libappfuse/FuseBuffer.cc
+++ b/libappfuse/FuseBuffer.cc
@@ -251,7 +251,9 @@ void FuseBuffer::HandleInit() {
251void FuseBuffer::HandleNotImpl() { 251void FuseBuffer::HandleNotImpl() {
252 LOG(VERBOSE) << "NOTIMPL op=" << request.header.opcode << " uniq=" 252 LOG(VERBOSE) << "NOTIMPL op=" << request.header.opcode << " uniq="
253 << request.header.unique << " nid=" << request.header.nodeid; 253 << request.header.unique << " nid=" << request.header.nodeid;
254 const uint64_t unique = request.header.unique; 254 // Add volatile as a workaround for compiler issue which removes the temporary
255 // variable.
256 const volatile uint64_t unique = request.header.unique;
255 response.Reset(0, -ENOSYS, unique); 257 response.Reset(0, -ENOSYS, unique);
256} 258}
257 259