summaryrefslogtreecommitdiff
path: root/upb/pb/compile_decoder_x64.c
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2015-05-13 16:23:35 -0700
committerJosh Haberman <jhaberman@gmail.com>2015-05-13 17:10:14 -0700
commiteace8e32954eb6152e8df06f5a18905c235f0156 (patch)
tree21d0bc239693c8cb4b3ea898ffea1ee694f6ac2f /upb/pb/compile_decoder_x64.c
parent51cf616dab63ba65c30cc58f0e5a61724aa4f731 (diff)
Enable Travis for Clang, and enable -Werror for all Travis builds.
Also added an extra Clang-only warning flag.
Diffstat (limited to 'upb/pb/compile_decoder_x64.c')
-rw-r--r--upb/pb/compile_decoder_x64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/upb/pb/compile_decoder_x64.c b/upb/pb/compile_decoder_x64.c
index a0cb3c9..51b9b9e 100644
--- a/upb/pb/compile_decoder_x64.c
+++ b/upb/pb/compile_decoder_x64.c
@@ -330,7 +330,7 @@ static void patchdispatch(jitcompiler *jc) {
// Secondary slot. Since we have 64 bits for the value, we use an
// absolute offset.
int mcofs = machine_code_ofs2(jc, method, val);
- newval = (uint64_t)(jc->group->jit_code + mcofs);
+ newval = (uint64_t)((char*)jc->group->jit_code + mcofs);
}
bool ok = upb_inttable_replace(dispatch, key, upb_value_uint64(newval));
UPB_ASSERT_VAR(ok, ok);
@@ -339,7 +339,7 @@ static void patchdispatch(jitcompiler *jc) {
// Update entry point for this method to point at mc base instead of bc
// base. Set this only *after* we have patched the offsets
// (machine_code_ofs2() uses this).
- method->code_base.ptr = jc->group->jit_code + machine_code_ofs(jc, method);
+ method->code_base.ptr = (char*)jc->group->jit_code + machine_code_ofs(jc, method);
upb_byteshandler *h = &method->input_handler_;
upb_byteshandler_setstartstr(h, upb_pbdecoder_startjit, NULL);
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback