This commit is contained in:
Daniel Donenfeld 2019-02-07 17:26:10 -08:00
commit 0860dd297e
3 changed files with 13 additions and 25 deletions

View File

@ -962,7 +962,7 @@ _s$2 = -16 ; size = 8
_ret$3 = -1 ; size = 1 _ret$3 = -1 ; size = 1
?foo@@YA_NXZ PROC ; foo ?foo@@YA_NXZ PROC ; foo
; File c:\projects\gsl\tests\span_compile_only.cpp ; File c:\projects\gsl\tests\span_compile_only.cpp
; Line 56 ; Line 42
push ebp push ebp
mov ebp, esp mov ebp, esp
sub esp, 44 ; 0000002cH sub esp, 44 ; 0000002cH
@ -971,12 +971,12 @@ _ret$3 = -1 ; size = 1
mov ecx, 11 ; 0000000bH mov ecx, 11 ; 0000000bH
mov eax, -858993460 ; ccccccccH mov eax, -858993460 ; ccccccccH
rep stosd rep stosd
; Line 58 ; Line 44
mov BYTE PTR _ret$3[ebp], 1 mov BYTE PTR _ret$3[ebp], 1
; Line 59 ; Line 45
lea ecx, DWORD PTR _s$2[ebp] lea ecx, DWORD PTR _s$2[ebp]
call ??$?0$0A@X@?$span@H$0?0@gsl@@QAE@XZ ; gsl::span<int,-1>::span<int,-1><0,void> call ??$?0$0A@X@?$span@H$0?0@gsl@@QAE@XZ ; gsl::span<int,-1>::span<int,-1><0,void>
; Line 60 ; Line 46
movzx eax, BYTE PTR _ret$3[ebp] movzx eax, BYTE PTR _ret$3[ebp]
test eax, eax test eax, eax
jne SHORT $LN4@foo jne SHORT $LN4@foo
@ -996,10 +996,10 @@ $LN4@foo:
$LN5@foo: $LN5@foo:
mov cl, BYTE PTR tv73[ebp] mov cl, BYTE PTR tv73[ebp]
mov BYTE PTR _ret$3[ebp], cl mov BYTE PTR _ret$3[ebp], cl
; Line 62 ; Line 48
lea ecx, DWORD PTR _cs$1[ebp] lea ecx, DWORD PTR _cs$1[ebp]
call ??$?0$0A@X@?$span@$$CBH$0?0@gsl@@QAE@XZ ; gsl::span<int const ,-1>::span<int const ,-1><0,void> call ??$?0$0A@X@?$span@$$CBH$0?0@gsl@@QAE@XZ ; gsl::span<int const ,-1>::span<int const ,-1><0,void>
; Line 63 ; Line 49
movzx edx, BYTE PTR _ret$3[ebp] movzx edx, BYTE PTR _ret$3[ebp]
test edx, edx test edx, edx
jne SHORT $LN7@foo jne SHORT $LN7@foo
@ -1019,9 +1019,9 @@ $LN7@foo:
$LN8@foo: $LN8@foo:
mov al, BYTE PTR tv84[ebp] mov al, BYTE PTR tv84[ebp]
mov BYTE PTR _ret$3[ebp], al mov BYTE PTR _ret$3[ebp], al
; Line 65 ; Line 51
mov al, BYTE PTR _ret$3[ebp] mov al, BYTE PTR _ret$3[ebp]
; Line 67 ; Line 53
push edx push edx
mov ecx, ebp mov ecx, ebp
push eax push eax
@ -1620,7 +1620,7 @@ ___formal$ = 8 ; size = 4
___formal$ = 12 ; size = 4 ___formal$ = 12 ; size = 4
?__empty_global_delete@@YAXPAXI@Z PROC ; __empty_global_delete, COMDAT ?__empty_global_delete@@YAXPAXI@Z PROC ; __empty_global_delete, COMDAT
; File c:\projects\gsl\tests\span_compile_only.cpp ; File c:\projects\gsl\tests\span_compile_only.cpp
; Line 68 ; Line 54
push ebp push ebp
mov ebp, esp mov ebp, esp
pop ebp pop ebp
@ -1633,7 +1633,7 @@ _TEXT SEGMENT
___formal$ = 8 ; size = 4 ___formal$ = 8 ; size = 4
?__empty_global_delete@@YAXPAX@Z PROC ; __empty_global_delete, COMDAT ?__empty_global_delete@@YAXPAX@Z PROC ; __empty_global_delete, COMDAT
; File c:\projects\gsl\tests\span_compile_only.cpp ; File c:\projects\gsl\tests\span_compile_only.cpp
; Line 68 ; Line 54
push ebp push ebp
mov ebp, esp mov ebp, esp
pop ebp pop ebp

View File

@ -229,8 +229,10 @@ function(add_gsl_asm_test name)
else() else()
target_compile_options(${name}_asm_options INTERFACE target_compile_options(${name}_asm_options INTERFACE
-S -S
-o ${ASM_LOCATION}\\${name}.s
) )
set_target_properties(${name}_asm PROPERTIES PREFIX "")
set_target_properties(${name}_asm PROPERTIES OUTPUT_NAME "${ASM_LOCATION}/${name}")
set_target_properties(${name}_asm PROPERTIES SUFFIX ".s")
endif(MSVC) endif(MSVC)
target_link_libraries(${name}_asm target_link_libraries(${name}_asm

View File

@ -37,20 +37,6 @@ struct fail_fast;
using namespace std; using namespace std;
using namespace gsl; using namespace gsl;
namespace
{
struct BaseClass
{
};
struct DerivedClass : BaseClass
{
};
struct AddressOverloaded
{
AddressOverloaded operator&() const { return {}; }
};
}
GSL_SUPPRESS(con.4) // NO-FORMAT: attribute GSL_SUPPRESS(con.4) // NO-FORMAT: attribute
bool foo() bool foo()
{ {