darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-12-12 14:45:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8198304: VS2017 (C4838, C4312) Various conversion issues with gtest tests

Browse Source 
Introduce specific casts to fix multiple type cast conversion compilation errors.

Reviewed-by: gtriantafill, hseigel
This commit is contained in:
Lois Foltan 2018-02-26 10:11:05 -05:00
parent c3893b01c1
commit 6e70a69893
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/hotspot/gtest/memory/test_guardedMemory.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -28,6 +28,8 @@
#include "runtime/os.hpp"
#include "unittest.hpp"
#define GEN_PURPOSE_TAG ((void *) ((uintptr_t)0xf000f000))
static void guarded_memory_test_check(void* p, size_t sz, void* tag) {
ASSERT_TRUE(p != NULL) << "NULL pointer given to check";
u_char* c = (u_char*) p;
@ -60,7 +62,7 @@ TEST(GuardedMemory, size) {
TEST(GuardedMemory, basic) {
u_char* basep =
(u_char*) os::malloc(GuardedMemory::get_total_size(1), mtInternal);
GuardedMemory guarded(basep, 1, (void*) 0xf000f000);
GuardedMemory guarded(basep, 1, GEN_PURPOSE_TAG);
EXPECT_EQ(badResourceValue, *basep)
<< "Expected guard in the form of badResourceValue";
@ -68,7 +70,7 @@ TEST(GuardedMemory, basic) {
u_char* userp = guarded.get_user_ptr();
EXPECT_EQ(uninitBlockPad, *userp)
<< "Expected uninitialized data in the form of uninitBlockPad";
guarded_memory_test_check(userp, 1, (void*) 0xf000f000);
guarded_memory_test_check(userp, 1, GEN_PURPOSE_TAG);
void* freep = guarded.release_for_freeing();
EXPECT_EQ((u_char*) freep, basep) << "Expected the same pointer guard was ";
@ -81,7 +83,7 @@ TEST(GuardedMemory, basic) {
TEST(GuardedMemory, odd_sizes) {
u_char* basep =
(u_char*) os::malloc(GuardedMemory::get_total_size(1), mtInternal);
GuardedMemory guarded(basep, 1, (void*) 0xf000f000);
GuardedMemory guarded(basep, 1, GEN_PURPOSE_TAG);
size_t sz = 0;
do {
@ -102,7 +104,7 @@ TEST(GuardedMemory, odd_sizes) {
TEST(GuardedMemory, buffer_overrun_head) {
u_char* basep =
(u_char*) os::malloc(GuardedMemory::get_total_size(1), mtInternal);
GuardedMemory guarded(basep, 1, (void*) 0xf000f000);
GuardedMemory guarded(basep, 1, GEN_PURPOSE_TAG);
guarded.wrap_with_guards(basep, 1);
*basep = 0;
@ -114,7 +116,7 @@ TEST(GuardedMemory, buffer_overrun_head) {
TEST(GuardedMemory, buffer_overrun_tail) {
u_char* basep =
(u_char*) os::malloc(GuardedMemory::get_total_size(1), mtInternal);
GuardedMemory guarded(basep, 1, (void*) 0xf000f000);
GuardedMemory guarded(basep, 1, GEN_PURPOSE_TAG);
size_t sz = 1;
do {

4
test/hotspot/gtest/utilities/test_align.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,7 @@
#include <limits>
// A few arbitrarily chosen values to test the align functions on.
static uint64_t values[] = {1, 3, 10, 345, 1023, 1024, 1025, 23909034, INT_MAX, uint64_t(-1) / 2, uint64_t(-1) / 2 + 100, -1 };
static uint64_t values[] = {1, 3, 10, 345, 1023, 1024, 1025, 23909034, INT_MAX, uint64_t(-1) / 2, uint64_t(-1) / 2 + 100, uint64_t(-1)};
template <typename T>
static T max_alignment() {